You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2020/12/16 19:09:00 UTC

svn commit: r1884519 - in /poi/trunk: .classpath build.xml maven/poi.pom

Author: fanningpj
Date: Wed Dec 16 19:09:00 2020
New Revision: 1884519

URL: http://svn.apache.org/viewvc?rev=1884519&view=rev
Log:
try to remove seemingly unused log4j 1.x dependency

Modified:
    poi/trunk/.classpath
    poi/trunk/build.xml
    poi/trunk/maven/poi.pom

Modified: poi/trunk/.classpath
URL: http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1884519&r1=1884518&r2=1884519&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Wed Dec 16 19:09:00 2020
@@ -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"/>

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884519&r1=1884518&r2=1884519&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Dec 16 19:09:00 2020
@@ -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/ooxm
                     <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/*"/>

Modified: poi/trunk/maven/poi.pom
URL: http://svn.apache.org/viewvc/poi/trunk/maven/poi.pom?rev=1884519&r1=1884518&r2=1884519&view=diff
==============================================================================
--- poi/trunk/maven/poi.pom (original)
+++ poi/trunk/maven/poi.pom Wed Dec 16 19:09:00 2020
@@ -67,13 +67,6 @@
       <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>
       <version>1.15</version>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org