From: Andreas Beeker <kiwiwings@apache.org>
Date: Mon, 28 Dec 2020 14:03:36 +0000 (+0000)
Subject: github-207 - replace commons logging with slf4j - use jcl-over-slf4j
X-Git-Tag: REL_5_0_0~72
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ab727bbde8ea20a9f72cc2c051bc83e0e79c7b9;p=poi.git

github-207 - replace commons logging with slf4j - use jcl-over-slf4j

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884873 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index 221c8678e8..b2e61e695e 100644
--- a/build.xml
+++ b/build.xml
@@ -264,7 +264,7 @@ 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-logging" artifact="org.slf4j:jcl-over-slf4j:1.7.30" usage="main"/>
     <dependency prefix="main.commons-codec" artifact="commons-codec:commons-codec:1.15" 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"/>
@@ -289,7 +289,7 @@ under the License.
     <dependency prefix="main.byte-buddy" artifact="net.bytebuddy:byte-buddy:1.10.18" usage="main-tests"/>
     <dependency prefix="main.byte-buddy-agent" artifact="net.bytebuddy:byte-buddy-agent:1.10.18" usage="main-tests"/>
     <dependency prefix="main.objenesis" artifact="org.objenesis:objenesis:3.1" usage="main-tests"/>
-    <dependency prefix="main.slf4j-simple" artifact="org.slf4j:slf4j-api:1.7.30" usage="main-tests"/>
+    <dependency prefix="main.slf4j-simple" artifact="org.slf4j:slf4j-simple:1.7.30" usage="main-tests"/>
 
     <dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.9" usage="excelant"/>
     <dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.9" usage="excelant"/>
@@ -622,6 +622,7 @@ under the License.
             </fileset>
             <fileset dir="${basedir}/lib/main">
                 <include name="log4j-1.2*.jar"/>
+                <include name="commons-logging-1.2.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/main-tests">
                 <include name="mockito-core-3.2*.jar"/>
diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class
index dbea856eea..98795b837b 100644
Binary files a/src/multimodule/ooxml/java9/module-info.class and b/src/multimodule/ooxml/java9/module-info.class differ
diff --git a/src/multimodule/ooxml/java9/module-info.java b/src/multimodule/ooxml/java9/module-info.java
index a3eb0a90bd..9067580d2c 100644
--- a/src/multimodule/ooxml/java9/module-info.java
+++ b/src/multimodule/ooxml/java9/module-info.java
@@ -23,7 +23,7 @@ module org.apache.poi.ooxml {
     requires org.apache.commons.codec;
     requires commons.math3;
     requires SparseBitSet;
-    requires commons.logging;
+    requires org.slf4j;
     requires java.logging;
     requires java.desktop;
     requires java.security.jgss;
diff --git a/src/multimodule/ooxml/test9/module-info.class b/src/multimodule/ooxml/test9/module-info.class
index f5564abd5c..ccbebf6019 100644
Binary files a/src/multimodule/ooxml/test9/module-info.class and b/src/multimodule/ooxml/test9/module-info.class differ
diff --git a/src/multimodule/ooxml/test9/module-info.java b/src/multimodule/ooxml/test9/module-info.java
index 9a84aa9fd7..1874f558e4 100644
--- a/src/multimodule/ooxml/test9/module-info.java
+++ b/src/multimodule/ooxml/test9/module-info.java
@@ -23,7 +23,7 @@ module org.apache.poi.ooxml {
     requires org.apache.commons.codec;
     requires commons.math3;
     requires SparseBitSet;
-    requires commons.logging;
+    requires org.slf4j;
     requires java.logging;
     requires java.desktop;
     requires java.security.jgss;
diff --git a/src/multimodule/poi/java9/module-info.class b/src/multimodule/poi/java9/module-info.class
index e9a756626e..5a2694941f 100644
Binary files a/src/multimodule/poi/java9/module-info.class and b/src/multimodule/poi/java9/module-info.class differ
diff --git a/src/multimodule/poi/java9/module-info.java b/src/multimodule/poi/java9/module-info.java
index 31ef8e1ff9..ed577f5f98 100644
--- a/src/multimodule/poi/java9/module-info.java
+++ b/src/multimodule/poi/java9/module-info.java
@@ -20,7 +20,6 @@ module org.apache.poi.poi {
     requires org.apache.commons.codec;
     requires commons.math3;
     requires SparseBitSet;
-    requires commons.logging;
     requires org.slf4j;
     requires java.logging;
     requires java.desktop;
diff --git a/src/multimodule/poi/test9/module-info.class b/src/multimodule/poi/test9/module-info.class
index 5df619f8a0..47a7d53297 100644
Binary files a/src/multimodule/poi/test9/module-info.class and b/src/multimodule/poi/test9/module-info.class differ
diff --git a/src/multimodule/poi/test9/module-info.java b/src/multimodule/poi/test9/module-info.java
index 6923f4cc7e..12b98cc595 100644
--- a/src/multimodule/poi/test9/module-info.java
+++ b/src/multimodule/poi/test9/module-info.java
@@ -20,7 +20,7 @@ module org.apache.poi.poi {
     requires org.apache.commons.codec;
     requires commons.math3;
     requires SparseBitSet;
-    requires commons.logging;
+    requires org.slf4j;
     requires java.logging;
     requires java.desktop;