Author: kiwiwings
Date: Mon Dec 28 14:03:36 2020
New Revision: 1884873
URL: http://svn.apache.org/viewvc?rev=1884873&view=rev
Log:
github-207 - replace commons logging with slf4j - use jcl-over-slf4j
Modified:
poi/site/src/documentation/content/xdocs/changes.xml
poi/site/src/documentation/content/xdocs/components/index.xml
poi/site/src/documentation/content/xdocs/encryption.xml
poi/trunk/build.xml
poi/trunk/src/multimodule/ooxml/java9/module-info.class
poi/trunk/src/multimodule/ooxml/java9/module-info.java
poi/trunk/src/multimodule/ooxml/test9/module-info.class
poi/trunk/src/multimodule/ooxml/test9/module-info.java
poi/trunk/src/multimodule/poi/java9/module-info.class
poi/trunk/src/multimodule/poi/java9/module-info.java
poi/trunk/src/multimodule/poi/test9/module-info.class
poi/trunk/src/multimodule/poi/test9/module-info.java
Modified: poi/site/src/documentation/content/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/changes.xml?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/changes.xml (original)
+++ poi/site/src/documentation/content/xdocs/changes.xml Mon Dec 28 14:03:36
2020
@@ -126,6 +126,7 @@
<action type="fix" fixes-bug="64981" context="OOXML"
breaks-compatibility="true">Upgrade OOXML schema to 5th edition
(transitional)</action>
<action type="fix" fixes-bug="64876" context="XSLF">Unable to
convert pptx to pdf</action>
<action type="fix" fixes-bug="65026" context="POI_Overall">Migrate
tests to Junit 5</action>
+ <action type="add" fixes-bug="github-207"
context="POI_Overall">Use SLF4J instead of commons-logging - use
jcl-over-slf4j</action>
</actions>
</release>
Modified: poi/site/src/documentation/content/xdocs/components/index.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/index.xml?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/index.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/index.xml Mon Dec 28
14:03:36 2020
@@ -291,7 +291,7 @@
</tr>
<tr>
<td>poi</td>
- <td><a
href="https://search.maven.org/#artifactdetails|commons-logging|commons-logging|1.2|jar">commons-logging</a>,
+ <td><a
href="https://search.maven.org/#artifactdetails|org.slf4j|jcl-over-slf4j|1.7.30|jar">jcl-over-slf4j
(commons-logging replacement)</a>,
<a
href="https://search.maven.org/#artifactdetails|commons-codec|commons-codec|1.15|jar">commons-codec</a>,
<a
href="https://search.maven.org/#artifactdetails|org.apache.commons|commons-collections4|4.4|jar">commons-collections</a>,
<a
href="https://search.maven.org/#artifactdetails|org.apache.commons|commons-math3|3.6.1|jar">commons-math</a>
Modified: poi/site/src/documentation/content/xdocs/encryption.xml
URL:
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/encryption.xml (original)
+++ poi/site/src/documentation/content/xdocs/encryption.xml Mon Dec 28 14:03:36
2020
@@ -388,8 +388,7 @@
<p>The package relationsships (*.rels) will be specially handled, i.e.
they will be filtered and only
a subset will be processed - see <a
href="https://www.ecma-international.org/activities/Office%20Open%20XML%20Formats/Draft%20ECMA-376%203rd%20edition,%20March%202011/Office%20Open%20XML%20Part%202%20-%20Open%20Packaging%20Conventions.pdf";>13.2.4.24
Relationships Transform Algorithm</a>.</p>
- <p>POI can use <a
href="https://commons.apache.org/proper/commons-logging/";>commons logging</a>
- and Santuario (XmlSec) uses <a href="http://www.slf4j.org/";>SLF4J</a>
for logging.
+ <p>POI and Santuario (XmlSec) use <a
href="http://www.slf4j.org/";>SLF4J</a> for logging.
To get logging information and debug output ...:</p>
<ul>
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Mon Dec 28 14:03:36 2020
@@ -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"/>
Modified: poi/trunk/src/multimodule/ooxml/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/java9/module-info.class?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/ooxml/java9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/java9/module-info.java?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/trunk/src/multimodule/ooxml/java9/module-info.java (original)
+++ poi/trunk/src/multimodule/ooxml/java9/module-info.java Mon Dec 28 14:03:36
2020
@@ -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;
Modified: poi/trunk/src/multimodule/ooxml/test9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/test9/module-info.class?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/ooxml/test9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/ooxml/test9/module-info.java?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/trunk/src/multimodule/ooxml/test9/module-info.java (original)
+++ poi/trunk/src/multimodule/ooxml/test9/module-info.java Mon Dec 28 14:03:36
2020
@@ -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;
Modified: poi/trunk/src/multimodule/poi/java9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/java9/module-info.class?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/poi/java9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/java9/module-info.java?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/trunk/src/multimodule/poi/java9/module-info.java (original)
+++ poi/trunk/src/multimodule/poi/java9/module-info.java Mon Dec 28 14:03:36
2020
@@ -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;
Modified: poi/trunk/src/multimodule/poi/test9/module-info.class
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/test9/module-info.class?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/src/multimodule/poi/test9/module-info.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/multimodule/poi/test9/module-info.java?rev=1884873&r1=1884872&r2=1884873&view=diff
==============================================================================
--- poi/trunk/src/multimodule/poi/test9/module-info.java (original)
+++ poi/trunk/src/multimodule/poi/test9/module-info.java Mon Dec 28 14:03:36
2020
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
