From 0ab727bbde8ea20a9f72cc2c051bc83e0e79c7b9 Mon Sep 17 00:00:00 2001 From: Andreas Beeker Date: Mon, 28 Dec 2020 14:03:36 +0000 Subject: [PATCH] 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 --- build.xml | 5 +++-- src/multimodule/ooxml/java9/module-info.class | Bin 3074 -> 3068 bytes src/multimodule/ooxml/java9/module-info.java | 2 +- src/multimodule/ooxml/test9/module-info.class | Bin 4035 -> 4029 bytes src/multimodule/ooxml/test9/module-info.java | 2 +- src/multimodule/poi/java9/module-info.class | Bin 3341 -> 3314 bytes src/multimodule/poi/java9/module-info.java | 1 - src/multimodule/poi/test9/module-info.class | Bin 3547 -> 3541 bytes src/multimodule/poi/test9/module-info.java | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) 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. - + @@ -289,7 +289,7 @@ under the License. - + @@ -622,6 +622,7 @@ under the License. + diff --git a/src/multimodule/ooxml/java9/module-info.class b/src/multimodule/ooxml/java9/module-info.class index dbea856eea2ce85eaec350e6a3f785d3f45e969b..98795b837ba4da1257cf7d7821098cec5d35038b 100644 GIT binary patch delta 23 ecmZpY_#?i7mywGzzbIX=I48{{YqKolQ!W5oRR@>= delta 29 kcmew(-XyVsmr;N}IX^cyKd)FXCqF$sGcSF!IO9_;0GTfeRsaA1 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 f5564abd5c56d5014813d074c5469aa2fdc7e24f..ccbebf60197629b8808baeaccbce45199e94b3f4 100644 GIT binary patch delta 23 ecmX>szgK<(FC!Oceo?w!aZZ{^)@E78Wqbf!!3S;t delta 29 kcmdlhe^`D4FQWi|a(-@ZeqOO&PJViNW?uScamHnQ0Ga~|EC2ui 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 e9a756626e14774719d1877c10e80e4cc8f27891..5a2694941fb587e57dc71d13880e1c2797844af8 100644 GIT binary patch delta 1041 zcmZuwTWb?h5S~d+HrY+B+MKjWlQg|pORILNw<1!kh=_=YiVq@QPLpli=CbMTrdqs| zA|fh9+d-^aFZK2$iufidKKr2mK-w4IeDPJNp4A8%eVcFQn{VdK%$aKb8rR-0y?zS- zo8alR_IyIM>|C!?7~VJ%fe1p~h!_*S1uK^`OSuR{e|xfqlXtCh1ey?*k7V<`m6B5_ zmo3{hvK-v1pYzq!7~85RGEY&mm1Y>`AsEG}NSI zv%?%Z5MuOBjU_pBB1CE^C(DlHbkQQV(*njQ;R`pf`47$UXzOUumqeY8`Z}H+O6FxyQNG!?vef`y2>KB zm+rF^+lP>#Mb;RqYVD^_ER6?giFL9=2&)JK33bRU347emY^1h88x;a!b{L_<3xyq5 zl(NE>TRB4Wfev=m8{Q&|s##-lB zayS@O0i|SG9C9?Ov@;VS`BUbZqNef)jWs)Q3VPNSr#KX;FDOe(ThAF*kv=N1?mtF5 ziqQ0Ls#z2{IUh&nw#F(5D{CpTt5Y%tAJ*2P;2%R3NH^xLkAGYkgcg`1ON*BB2P1GZv4~2rV;^nF= zeGCQYWvE4|c(*y_^)aJ`W!-CDf>0x*s|{>g4n=}SdE7+D)K$$l{yoWxYZf@%q&c+} zZ_yi7XLk_RRwY!b(;DzDrM2~VpAKlydZBH`C-hkxR2P8B4-KG_ k9_|kgLd*lNis3Vu1{s=#+b{?Bz%MO?2NEGXlo;Xh4_iks`zF>}HeQnd!`I zGz1AEB0h+igJ^&JNn5QT6s2zki_gA@Z-St2J{1bSYkTe{QuSrH-#Ono_k8EO^D=+F zU_N~P=U)IY4Yx0vzpo6~UZ>-^;bhxuHd}5p0~rMA1UYbhur480Sh88l)FDl~yx z#3;fz?ZAqxH9R*86>O%Hn4KO+$h}k4syQd3z_KGRQ1Agl=DqBkA2#T3ETrF}eMJA@ zn3!NPt;I441vP{$AC;^-iwdR?Ml_;heQEJA!q^6g)7?JF>}iC_w?bL56QSG-Jnu`1 zT?ly%QXQ}Ev=!_|C@?OtvKbl_BlLMJE%vNel#&evdl9NkC?)5tAX4xtU5jlMpCRvI zEmn@Z9NNdBiV-aNk*DAbZn9l`xp8H>8#=+pO)ON$~S_VbqX3}!cK@d#fd6zOq% zh#m+-9MJPHNZGoff`j^c#{E59vzo28qu>w?#JAxQ{*Dav5}xI=XGf8J(4Cg!o5Z(z zPYlxQl_#_V$LManj274B=tX=`*jk4!*px^MXJZc8vFyNOPn*onNw>waT3QejQ-0w2 zP7p0ASfG`}D0XNqQACgKC#v`zJ>zdk|0YVFZ2cGW1PY<}~Rr8j+=UL`l<85%XVi?i$5{zlieqn76? zILGRlFW*E$x^Gkye$-TOo|}$|3tHe)S>#7@QE%$0ESYmooAvNa#6mJOD-Cf;FJ*@u zPS#CL6u~YJ~S1s(TurG{Gvm5WS&l& z!{R2wl(w4gnHBtv9-FiB1qlA90Zb~Sb|!PZ^XwmoQ_DDhr3ZisKfq6L4Q@b;PY6FV LLim+2!ma-Ru(1?8 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 5df619f8a0b7839dfaa1d284774550d8b3756531..47a7d5329769a2f66450d06fd0321ad93d72ba6a 100644 GIT binary patch delta 21 ccmcaDeN}qG4ld68qIA9DoHUcHjVFY80bm0NGynhq delta 27 icmcaAeOr3M4gvn;{M_99ykfna{Pgt9y!4HSgn0p;vkLM6 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; -- 2.39.5