From 9626dd0661159b09e3fbeb93a59cf1b8f0cfee60 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 25 Jul 2022 11:22:08 +0000
Subject: [PATCH] update some module-info classes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903003 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |   6 +++++-
 poi-excelant/src/main/java9/module-info.class | Bin 306 -> 256 bytes
 poi-excelant/src/test/java9/module-info.class | Bin 423 -> 373 bytes
 .../src/main/java9/module-info.class          | Bin 278 -> 219 bytes
 .../src/main/java9/module-info.class          | Bin 1792 -> 1867 bytes
 .../src/main/java9/module-info.java           |   2 --
 poi-ooxml/src/main/java9/module-info.class    | Bin 3841 -> 3744 bytes
 poi-ooxml/src/main/java9/module-info.java     |   1 -
 poi-ooxml/src/test/java9/module-info.class    | Bin 5228 -> 5131 bytes
 poi-ooxml/src/test/java9/module-info.java     |   1 -
 .../src/main/java9/module-info.class          | Bin 2696 -> 2637 bytes
 .../src/test/java9/module-info.class          | Bin 3343 -> 3284 bytes
 12 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index b3db7068a3..1896cc41f3 100644
--- a/build.xml
+++ b/build.xml
@@ -1074,8 +1074,10 @@ under the License.
                 </filterchain>
             </loadresource>
 
+            <echo message="Building classes for @{module}"/>
+
             <!-- compile the sources -->
-            <javac release="8"
+            <javac
                    target="${jdk.version.class}"
                    source="${jdk.version.source}"
                    destdir="@{classes}"
@@ -1097,6 +1099,8 @@ under the License.
                 </filterchain>
             </loadresource>
 
+            <echo message="Building java9+ classes for @{module}"/>
+
             <!-- compile jigsaw files to sources, so we don't forget to update/provide them for Java 8 builds -->
             <javac release="9"
                    srcdir="${basedir}/@{module}/src/main/java9"
diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
index 271b567453affe97d9dd6768cdd2550a29e5991f..95b0590d80e5f25cafab86a7ee0f9845e0d66315 100644
GIT binary patch
delta 108
zcmdnQ)WD>1>ff$?3=9mW3<B&7oQw=?zWFJoIjO=7T*3_8!VEmZ47?%?d?F0|6NBbj
nGcqs%m6|Xx14#xT$<hF%7+66B0~?rRVqgc;9AJ_W$^&u$j~xoY

delta 158
zcmZo*+Qbxe>ff$?3=9mW48rUTJd6xn!TF^{$*FFcIjM{c0=fAqr8%j(nR#jXdRd8O
ziHr<vzF;9?23}zXK1K$1Lqk0SJwpRw27X}%0TBj45eA`&8greQ7?^;DGBGeSumEWj
j238=+0OYYXFfgz)aDaK7V3LV}3rur^NuUG3G>`xQMZOl7

diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
index bc5c4be45ea8a67f04ec4d26a72a894ec9de6555..281315a4d42f27a1dcffaa20eb202f81637936f8 100644
GIT binary patch
delta 145
zcmZ3^{FTY_)W2Q(7#J8#8N}Hcco`YkeDhOEb5eyF_=Fkwg&72d83ctHgcuoEP4z7F
zjD#74MHoax7(|5`#3m-c^=D*Y0_yc(U<Q&546F<+4L}M=g8&<tWCxNQ44hz+iGd3&
O#tkNsd5jD^ATa;{Obw*~

delta 195
zcmYk#Jq`gu7>Ds^hPAA3vp(-&VkMh!0nw-wYGEZS%O;XlyMj}=gTevaMX42ID$VcB
z|7qU0yyZ5}&;0>}3|txlZ<%JNO*D&>NYFT>+boHO@o|^x{rbEX6c#oqnu?ad4FWyV
z!APMLzM?H~LOs!AMaQS>(^K@X)7MHO%@;|Iyt#86BgVo7T#9y;te&w<#VV=VR<r&u
HLH*ahovay`

diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
index 25db90320c40bc0e8b1946f59a2798531c23d9b7..d445b14e8af144ec4261ddb4cd9efcccb7e8bc6c 100644
GIT binary patch
delta 93
zcmbQnbemE2)W2Q(7#J8#8Ti;4I2ak&eDhOEb5eyFIE5Lwgc-Pn8F)k(cqc}*>oYPi
h0o7?RFat>jAj#4Iq!?I11Opp`1CV57U<Yv^0091a3fBMt

delta 152
zcmcc3IE^Xd)W2Q(7#J8#8HCswco-SDg7Zs@l2hF>b5a=@1ak9JN^??mGxO5&^|BJn
z5*ZoTe8ED(47|b&e2fh2hK70udWHtV4E(|j0zhd)Jwqcs3lRpviK^}9ObkpwqnQ|(
n8CZa{1_LXQWB~Hm8W<SZ890D!b_Pxc2L>(%Mh0$>6a)YO6WkZ=

diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class
index 81a57f1fdf368d9cc4c2a37f98721de2788b06b3..61cdb0a1b8ed9ad1d72863186c161d73fa319cde 100644
GIT binary patch
literal 1867
zcmb7_*>ck`6o!9M=t9{eXbUZLVJpxmOIy0oQcB^D8D?O(S8XK`#Foc$()6y+#RU(*
z6;H$<ABRloq#m4$PgZ<3>HLy^{{H?0z#86<;UUB52jh3zs)R=+JTBo$2~RneIi7Jm
z=Xk-f!cpcB92Jf#M~$P-vC6T=vCi?5V}oOpV~b;(;}ypa$1cZfjy;Yy9Qzz^ISx49
zF-!)OYek0*!!T>&W?4qkYpHT%blI3*&@Njy4Wwn5_$s@yd?>AAD4jBOMu$p<&SIP_
z+?-*_Gl2-S7aMCDiRcFr?%zlz`cSuZa?DU0Ze<z`?J42M@<@kG(W_M|8^YJJ8OwlS
zG1p1;JavBle&lRmSji35)mED{d$lG4sY8Z^T>B#v`wYvuHtAZ{-CCMfHyLJz+ji3(
zTy|S5vTg|1jlmXDSA;#bi3$WwTwUkbx<LI+WSB~ARARO0#9H(!)y+y>bgT7q->foJ
zQXdnk(Dk%o;y@;LP)9#-(5C*Z3$G>P#I>}5%b=yAfK%3qB55M+C7sx*cBeoZ8^ucc
zwxv{Zkm-<NuYi9lhA1|kves$%zd~fHJTP7-P+{_STRS!}!N=HjAx^Y%r))Q;ilHHV
z<E8%g%je@L4X|G{fa)bG^p$_Qiq)b)oOoLKEf`vStlI9vFrjVf$ko1GG_7^ARDOTu
zc}2T^Tet0$Y#{1PZ1tR^r*v}0Ydy#7Uv->u+{$t6x$F6xY^uIG+(n`j+5V)Pq0BTs
zojM=Y>3zi=^G)H-uJ3M}6M(tTO!i~A;2wTq1oLhj!Nn6d;1bP7(?`r<jK*=|1o1L)
zl6Zx9m3WPKop^(IlX#0*B68ww;vM1?ahf<oyi2@CoF&c??-L&o=ZOo%MdA{X@CSCL
BG)Vve

literal 1792
zcmb7_+f&m(6vn>=<?01(6cAJ{-cZT*1`3EGqHoSPgX4Qhw(V+@&1BP3-uSzG@X06t
zD94l2(y0t&rhWKrlbr9{%{gZ`fBydb1z-ao$1x%>9h#ukRO>pb8G)%o(@K2xNjH_i
z%)le}yVv#v#y)d&0pkLTCaJq#?D-Al#zwowbi$@<=`!?e0h0ognaDlzESZg!s&3IO
z7jR9WFrXyOk@6xE+z^;x0o`&iBe3e5P=?x1j5W1X_M9c%jlEPK>84Ik9NZRIxj4|&
zYT8#)b$msJ&ZUOExbEQKuE2V(VOv{mWT#v#m1XGZ$ibYza<1gqB!Po_0&BTp<XPO5
zfv#I!cd#fhe{py_%g_UIqeRMX2_%)EpCT@Wv?n%Iq2vn(OSHyI!pSa3yki~Fq$>im
zS(r+#maRm~PO-FAtjKn$;^5Jx533HI2oy7=iB&`;teGVAQrllsZ-%g$Wscs`Z+J=S
z;F*9NLe<UpbAj>@qFDQBD^U(!3hWM{vvH!lz&4ah56<%A3hWJGkrh5pjIXSv^!8nf
z`7Yg7JTQJMR8e}Cu$E0t_$8tICaG4|L0RB!&RQ;X35=gv*l%A?;>@Eeus^Ja>ZB?P
zR4}-fO@ZpLKGYu#2e0#sa^YJfs!2zHiEKm1^b*?wJHt+HssB{a%fg%d)l(l>Dg;m2
zZ{Th#z7?qCOg+#-=Y)F#n>oV&8|R#MUtl{&+o41GhgVm<#-Z~>r(W|=*CVgH4-N$8
zGW~IdLyEM?w<PV^fX<y$K+yN0`y0V1{Taa(T&3|h#;`==C?-yUDNOU#b-FW!1>B?&
zxWz0m?=WYX^UMY2eda^vGIN#rnE8~s#(cqCXG&&?Sz&H4Uop3sJIr0?JLY@l2PWem
DkPI1U

diff --git a/poi-ooxml-lite/src/main/java9/module-info.java b/poi-ooxml-lite/src/main/java9/module-info.java
index 090dc1e6d6..d845bb4ddb 100644
--- a/poi-ooxml-lite/src/main/java9/module-info.java
+++ b/poi-ooxml-lite/src/main/java9/module-info.java
@@ -23,8 +23,6 @@ open module org.apache.poi.ooxml.schemas {
     requires java.xml;
 
 
-
-
     exports com.microsoft.schemas.compatibility;
     exports com.microsoft.schemas.office.drawing.x2008.diagram;
     exports com.microsoft.schemas.office.excel;
diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
index e6ae9b24f192466de10635727015e9eb8f51dd13..f4de282d8f41ca5b369c7fae640da7e5c782375d 100644
GIT binary patch
delta 334
zcmW;G%PvD<5Ww;OY3Zow#`mF!6N!~Hsw5&I60xxB3%Flelr}cRmIn}y;{m)wcS5Oa
zV&x4yfOimcCYk)^l1yeU!n={;*WY~$nBhaH1Z2v`mD76Fp|R)KcN{osjzh<hqaH1X
zQ6nE+mYnCxbM1*dH=fvY>!a_JP<Rj?g_iInJPU2%MR*n7g!krI&<>jAbTvC0kb=}4
zX*~|(bewCVlTkHeirJNn$(r2||MV0Vpx1iGqGoUQnf>N~nKuW`A#*q}p3l|BCTzcG
nPMRfi%A8J&KXbo@fF&&h{VVxxMXOcT)O9x0O}5l+cGTT}PWUjk

delta 414
zcmW;HyG{Z@6b9gbR$+i(Vwm+7BO$TVFz%wp*ijJ+jfI`}m0fP4n{Y9f+S=&4#@fyY
zpfif%UDS85_XVtohiSeu|2b2fb2WAx&$K%?O#rj_<|r{lR@{0e>tu>$hoOJZwd-Xk
zS=`ULvSb}t48bMU64(_eGjP+ChBOUN#=|sBNpnt`-r{hGAuuB;dbS}1P6f^cJb`lo
zU*JM`*R^RKw>s{0G<DqTc+k<(@yPMS@yzkU@yhYW@y_wV(dPK%_-f3v785bIl9yT6
zb_!O#Dyuc?FxB|e^5LWgjZV?fgI+3W1SkO$2p$0(AtWe;l@TQT%jo1t41#(bx^h4{
z*wz1u4zW?c6D^LXDNA&nQW{EAnNlYGlfK{ORr&#}Dc6-7%1z~#l3{@=qg_DTZPUxb
P4w;2bI>?cE6v*N~jVeqB

diff --git a/poi-ooxml/src/main/java9/module-info.java b/poi-ooxml/src/main/java9/module-info.java
index 51533acbd6..69636d8960 100644
--- a/poi-ooxml/src/main/java9/module-info.java
+++ b/poi-ooxml/src/main/java9/module-info.java
@@ -91,7 +91,6 @@ module org.apache.poi.ooxml {
     requires static org.apache.santuario.xmlsec;
     requires static org.bouncycastle.provider;
     requires static org.bouncycastle.pkix;
-    requires static org.codehaus.stax2;
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
     requires static batik.anim;
diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
index 48fd3276288b4ec91caf4c4fbccad4ed39a2eade..7c96479a4509662fe931ca55a1c0468a98bf7a93 100644
GIT binary patch
delta 1086
zcmcK3$5Iqg6o>I|NUfArqUVabF_at1LQs%k1arh#X2Apsief^{gAo-I&MO#Dm+V;Z
z0IbbEfC)uk!1CT(|D_8zZoc32>6)4D(=$Uw-9-(9zxxM(3VtP=Pmx#G*4W<KWLz*V
z8kdaAM%w5!t{7L1YsPishH=yAGHw~SjXOrSao4zK+&3N=4~-t<QBPO-)D*cDCDkQm
z#$)4&<Ei7Bqu24=@xt-a^?d9oG+sGgJKi|nI^H?nJ3hEfb86b8gii^d6TT#TP572D
zl<+;_N5XKz&%S|FcdD-;yL41liY&+(B-`H)Oed$)LoQQ%^J0_O5n;^8*nG(JkDj~$
z3gYn?YQ1A)E!M@3i!F>DA3Gs-VrVA6prrzenc?4COo=akUK*VlJ1e#<wmf!rXr{Md
zIGv)N27eITBlpUEa=$zv8)cI`C=bbI*&+|iBeGQ<g>?MlV;Z!{8kYK3S$=)>?AGl6
zTx7bQf4IuOUS!yC*jm_eFl;#(_8bhG4u)L^{X>dY%Bo=6pQzSgj+`s!$@$X%PT~hF
zlr^$eE|QDo61hw+mn-B-Z+!l%G*~Uy$hERgu9NHK2DwpglAGlgxm9kH+vN_ZjCZtC
bgIzNGagO^lCphVQiqpRBobm18tnax$wo-$g

delta 1144
zcmbW$$xl;30LSs)E6WHmDKZn4lNc`;?X$0?f@|wmSKM%4kXi~93YC@uuB~3{R{Jlw
zdoYok2mb&Q6A$kHfE$Xto{aN`-`#}E_cJr^C2!vAwAeJ!6n*^n;UfSc{1GTvsBKT@
zGVw$-nMzow8%THMQVCyjusdz{#YSQls@u$x#CeGe7KG#2e%tYv?70i|#enU!*p5U|
z;-bVQiOUjKB(6%7B(7PgYPR()rH<fyiR%(KByLLFlDI8#N8+x&A!N7O0f~FE^k8(h
z!ZU^E3NI91D!fv7t?)*c!`6bJ!dr!R3hxy@D120yQ1~S9SzuD&i@;ZbZvx*1ehB;&
z_$BarykHeAS)b1I*zt5%qBoYy+S%dQSYW)S!kOvwz@xu|2NkFUDxacC&wxd!E&u{E
z(5PoMrnP7+4|(S`)M1uh6R0<prpj&kzITq*P=4Y~h9Y{t7;b&0w&@a6zp10I1rRiC
z)&(Nv{<_ILaMa8?Oplp%n#N3z>spATiza9{?V-IiN&9F&P0;~5IAtDbE}Wo4G()p=
znC560TlC1IKUo~p-=uzj_wD|(%V}>i#LX_HEwq&`)6X{>SWZ{am2?$dO~W)o*U+_e
z9bHd1&?wzVH_`lN4z|*5w2f}3JLpcji|(fFbPwH2_tE|I06jS6Aspty5$YaC_a|`=
kq^o-*T|23JEZsTuUuQ&*Mlq&)5~p-e<BaZEoYT$!1CP<3SpWb4

diff --git a/poi-ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java
index a6a78d6e4e..7ed78a0e75 100644
--- a/poi-ooxml/src/test/java9/module-info.java
+++ b/poi-ooxml/src/test/java9/module-info.java
@@ -89,7 +89,6 @@ module org.apache.poi.ooxml {
     requires static org.apache.santuario.xmlsec;
     requires static org.bouncycastle.provider;
     requires static org.bouncycastle.pkix;
-    requires static org.codehaus.stax2;
 
 
     /* optional dependencies for slideshow rendering via PPTX2PNG */
diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
index 559f2cc250f86106811fc4dbe76fc4787dbee327..9a3a927772b8f5de3a9b219c58fbbe6387a97ed6 100644
GIT binary patch
delta 213
zcmW;FJ5GX85QgFR05besi*rawXxst?4FS1|+%aJVB+!vqL8-{qmbK7XumBU+LuZ`-
zO!0h^Ddzji|GLW0-}enDa}qj+`1ozHUM(%pmagT+(zEm}1Iy4da*Q1l$JFt9nV$>7
zyYL}wg->B8?1h7Hyr#`vW`+ou4N)xsA-2`vfk!nSu6he6;SIb=Z;6!8v^V3;hF-ft
V&J^`4Ref92e4?&4XlhxD_CIo#8KD3G

delta 271
zcmW;GNlHUO5XSL;KQ(3I2;J@l-P)uT5yUwf$Ee^59{Pkx^ns8pHI9kyJc_t;;Q<5>
z;7QzxWp92(eH2yo<+@|(=kNOmFw3*BWhfox&CBDgT5n{A(ewPI*~q5q7pJ*DOIxX-
zP>Yde+p=Sj5PaE(vSrt@XQ^5CEeDoE9i8@J&WD%z&ZOhYaqVb3ZiHLmPPi8ygh!zx
zbcLta?;oioB>GH354~Vo^l1k|q5W?^<JuKtQc__cIv5>NhY4>J#St^J5TnKDQgk`0
TTUpWdt6JBnsOxO#!77`7MuaIz

diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
index 385430d0919e062d86108372150f9de0218441a5..21de811871ea20a71217f15ffa83ca3e2aa73a97 100644
GIT binary patch
delta 699
zcmX}q$5H}86a~;bAT%Pz9s`(A5i=?}iW$X#0dpw#>cX<hm22FYPy|1PoeMv}wclge
z-F0zu&zm>XZ+b#L^b<^d|9*Y}aPT3pZNZzly|}x%l-QBTNbE}NN$g7;NE}-5II%=5
zE^#DrY~#ensf{zcaGi@tJlJ@&@nqv!;6)%O@G9^okQaCtC<qiwQLE@Xx8MTYX}Hy0
z0Us*v74RUe(yL1dlRlG`D*dQ38896O)y5i=wI=IymMp)tvKE$*R7cunx<VavsLF+a
zIv4)0^f-OB9;nqLwR)(wo;FZPZQ4kiv{|*FnT-}2q#@c$+h{xOq~-0Fx8KEnH|?Pj
z+DoHK^Zb2m^wR;Fq=R&b4$~1DqoZ_;j?*}upp(=AuFNZ&Vq=;n=nS2ub99l;(*<fF
UrT&vuHFFK?DmRc;pKlXef9Rt(7XSbN

delta 778
zcmX}q$xake6vpv?HNyoIZM;_$1jTuz>}qX51;q(L#0du+6QXT`K|3))ceXoc5m0#!
z<IaT-;M%n>;of+v^0kZle)pWZsobG{b<B5GfByac11PcVxDe4YS($rsuRJm{TaL&-
zs@$KOE%(kmeo%=YPCuQFXq?Deo{OGK5iUvMLYx#lmpzl7E1s)1sTe2yapJia(NKy9
z;-creXDV<ba5Hc#a651(a5pSWJu3uW23`eT2i|zz2HpkU2R=CF9UmPFjz!0k<CEjF
z<IC4Si%nxWa<=Rob<{)MC=FIY6OAvxnLSoD+v8}lgcbIzq}6g2tFz2o+Qz^AZuU_X
zj%DR=mdCR^VHt6fQ}VPNktMd+C`aDrZ2LcI)7v%D%OKavcDXLKYM)rIMu+T_8)TR4
zmK)_J*&{d0t+KY<+VZ!nzeDactLZ*>sj*w`k$dGn*(+=3606=X3o?;Kc|abNCD{kh
yvxDweV?Z8~hvgADD2L=xnO<SKk=n%#t4^;o?MIxk|7Fx1<E-U4=j{3>IR6iWMoiEE

-- 
2.39.5