From 8a66685c2dca10890b98e8ad22679d6d78772839 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Wed, 16 Dec 2020 19:09:00 +0000
Subject: [PATCH] try to remove seemingly unused log4j 1.x dependency

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884519 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath    | 1 -
 build.xml     | 7 +++----
 maven/poi.pom | 7 -------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.classpath b/.classpath
index 5f16a42678..bc1b182009 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,6 @@
 	<classpathentry kind="src" path="src/integrationtest"/>
 	<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-4.0.0-sources.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
diff --git a/build.xml b/build.xml
index e9e8c6aa04..1272d224fd 100644
--- a/build.xml
+++ b/build.xml
@@ -268,7 +268,6 @@ under the License.
     <!-- jars in the /lib directory, see the fetch-jars target-->
     <dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main"/>
     <dependency prefix="main.commons-codec" artifact="commons-codec:commons-codec:1.15" usage="main"/>
-    <dependency prefix="main.log4j" artifact="log4j:log4j:1.2.17" usage="main"/>
     <dependency prefix="main.commons-collections4" artifact="org.apache.commons:commons-collections4:4.4" usage="main"/>
     <dependency prefix="main.commons-math3" artifact="org.apache.commons:commons-math3:3.6.1" usage="main"/>
     <dependency prefix="main.com.zaxxer" artifact="com.zaxxer:SparseBitSet:1.2" usage="main"/>
@@ -606,6 +605,9 @@ under the License.
             <fileset dir="${basedir}/lib/excelant">
                 <include name="ant*-1.10.1.jar"/>
             </fileset>
+            <fileset dir="${basedir}/lib/main">
+                <include name="log4j*.jar"/>
+            </fileset>
             <fileset dir="${basedir}/lib/main-tests">
                 <include name="mockito-core-3.2*.jar"/>
                 <include name="mockito-core-3.5.0.jar"/>
@@ -638,7 +640,6 @@ under the License.
                 <and>
                     <available file="${main.commons-logging.jar}"/>
                     <available file="${main.commons-codec.jar}"/>
-                    <available file="${main.log4j.jar}"/>
                     <available file="${main.junit.jar}"/>
                     <available file="${main.jmh.jar}"/>
                     <available file="${main.jmhAnnotation.jar}"/>
@@ -677,7 +678,6 @@ under the License.
         <mkdir dir="${main.lib}"/>
         <downloadfile src="${main.commons-logging.url}" dest="${main.commons-logging.jar}"/>
         <downloadfile src="${main.commons-codec.url}" dest="${main.commons-codec.jar}"/>
-        <downloadfile src="${main.log4j.url}" dest="${main.log4j.jar}"/>
         <downloadfile src="${main.junit.url}" dest="${main.junit.jar}"/>
         <downloadfile src="${main.jmh.url}" dest="${main.jmh.jar}"/>
         <downloadfile src="${main.jmhAnnotation.url}" dest="${main.jmhAnnotation.jar}"/>
@@ -2170,7 +2170,6 @@ org/apache/poi/schemas/ooxml/system/ooxml/rectaf36doctype.xsb
                     <include name="commons-logging-*.jar"/>
                     <include name="commons-collections4-*.jar"/>
                     <include name="commons-math3-*.jar"/>
-                    <include name="log4j-*.jar"/>
                     <include name="SparseBitSet-*.jar"/>
                 </fileset>
                 <globmapper from="*" to="${zipdir}/lib/*"/>
diff --git a/maven/poi.pom b/maven/poi.pom
index 4b99095f18..a73c95f357 100644
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -66,13 +66,6 @@
       <scope>runtime</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>