From 21dc03f9a7f49bdd587d8aeef8b1b9dbdcd3ba76 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Mon, 12 Jul 2021 09:02:00 +0000
Subject: [PATCH] use xmlbeans 5.0.0 in ant build due to build issues

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891475 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |   3 +--
 poi-examples/src/main/java9/module-info.class | Bin 978 -> 929 bytes
 poi-excelant/src/main/java9/module-info.class | Bin 342 -> 293 bytes
 poi-excelant/src/test/java9/module-info.class | Bin 459 -> 410 bytes
 .../src/main/java9/module-info.class          | Bin 1757 -> 1663 bytes
 .../src/main/java9/module-info.java           |   3 +--
 poi/src/test/java9/module-info.class          | Bin 4135 -> 4076 bytes
 7 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 3b57109cb1..5f93b516b4 100644
--- a/build.xml
+++ b/build.xml
@@ -330,7 +330,7 @@ under the License.
 
     <!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
     <dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.06" usage="ooxml"/>
-    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.0.1" usage="ooxml"/>
+    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.0.0" usage="ooxml"/>
     <dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.20" usage="ooxml"/>
 
     <!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
@@ -690,7 +690,6 @@ under the License.
             <fileset dir="${basedir}/lib/ooxml">
                 <include name="xmlbeans-3*.jar"/>
                 <include name="xmlbeans-4*.jar"/>
-                <include name="xmlbeans-5.0.0.jar"/>
             </fileset>
             <fileset dir="${basedir}/lib/ooxml-provided">
                 <include name="bc*-1.65.jar"/>
diff --git a/poi-examples/src/main/java9/module-info.class b/poi-examples/src/main/java9/module-info.class
index 99c4f271f9b2363dd4bdd4bb3592bed93a6c893e..7f1d82fc9eacdf95a9affb33eb3aa125b367b7b7 100644
GIT binary patch
literal 929
zcmb7@T~fj@6opR|1;ih;R}ln3RQy5OCzs(OB7`5OrJbh5`o^Pc^1%hTD93Oa9fp~9
z#yosUb58F~&P=|(KRy9G!p`GVVEf4*#ICYXwNSHgW}$AOK{zKg2`$0}p-s3XToJAb
z9l{OamT*V7Cv*u9gq}dj<2t>`bm$9I{BUH;K=#MV4*ZF&66po5(gMX7Ig|FY)JlNX
zT)v-pu0VBdTlYg5^~Zr62o(5twl$2+S@v*D59has(+}T*NT8mkj{`l-lC_&Hdq(c2
z7T0>{sF|8Zu~wl8MVT9QGTkf2^fSK(rfV&&jyB1*(?w_KhhFSTfo6tj94*pMJwhB!
zvgCwgOU)(uS1#<<QK+OhnT|37WaCPJsYxd$K<Cdm2ZVV9%OS8~7Vp^P&m3~|#bOIB
p!)<1Mv4JuQJQtZe%o1~#xyRgR9x%(yL*^0FViNP1dBUtP89%#^0OkMy

literal 978
zcmaizNlwE+5Ji855Fkten|VkG^JD{pE3jk52^!NOMs{quZ3sJ-oQVYo;82L7B2a`#
z<HhT?`&CuzOMd@&eFJcT(-D*i<8g9ZMEW@Fv=Tz~Iw`V1Uxtw;)cTIRd-b3Ql`F9w
zj1U%*?9NlE3fkIBlhD&$6{nFl4#o&$U%q#v4EL#=o_i<WnS%*}`>QBPx^d)Sim>$S
z!~~hjgLbNJ9n=V;(vW2rvxGI4{oZV!XZzo?{UCcva~CdQb&%3dP0Pi+%`g!gi&i6M
zW0`O`aEdW4Uq9$hUKpKmlA3S6O4zX$^ttP{@sBBwZxEITbu-3Alh7P|?zfUGE+XY(
zi%_?C?ffhB9m{o!JY-|fVss_Z14~}rzw$b=<Rt|r&$Noe&YcVIKesR26PwG~`akY7
zK>WA#o)U(5Q$iWTyuP3!pUW712C5iGgWo5G)4Z#qh8bP~M>r>35H1N<glodOa6`B$
R+!pQ%_l1YTW1%k;d;-cH4Cw#>

diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
index 9d9c4c142da194581d8bd592216a523ebb1de85e..2d75c59c3f2a0d3bee8e8ebb0bb8d92a3b2df147 100644
GIT binary patch
literal 293
zcmZ`!OAdlC5PhSF;$KT*bmIx6D>vT3L)20QgO&gqmYmCl2k=nFT1-q#oW+~>=1tyY
z9?#nyz#7vwx&(Kt!%LzVdJKJr0mG1C<YVk(Lg<~WyNb_yO_=HI5QtRBNCl~m164|u
zh;u>kj^ZkUoyZlTX(#^AuGZx#A<Tcqxy(c%qf~^1h4FYD&rLkfbN;=s{BQD05hoQu
h=B>I24MR3)TIs;4-lX*gxE9+M8|c{XS)`9L;sqb>LEr!Y

literal 342
zcmZ`!OKt)&6!V**LxHw@G6>O4PtXLavf%*iSaE_h1Q-;^Xg(E7&c&h!;82J(fK(wh
z3;Q|ti<RT)@B?6kZWRHcv9a^g==Ws1u!Q=|mYLF%#Arh6kHy#WTN0wFPcu{rJ)14L
zOr=_Bp4x=#ozg~b3x*n@_M7KlGI#Gp!%sfo9}G`~&<9=!@!htyyNzLJ5&Cydt}<Du
zRVwE(I)qnei%YF=wIa{OtvN<ac>CWMWs#UYK<@vS6CiX$fC?TQj}iIn3Lf`B9SyIZ
QJvKcCXnSTJ>8hMK1BhcyjsO4v

diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
index c4cef92e7933854bbd4402a12fcae2abaf37f73e..5815d92425c840e0c0cf4296acf183dd158871f3 100644
GIT binary patch
literal 410
zcmZ{g-A)2A5QWcxEF%7Q5%9(*up2IjPoeKHE=5YV+h$t~mpqpjK7bEp>=qLZ#$J4x
zIcFww(vQ!#cK~xt`#2|Lk9M)Cl)#0+rNEWIwSW-F3B9>|kTZc%j+-1~feB$~()hiu
zmzFTL&5LBm<w{9swN%?uRa^(cV9l>ApV=!yH!1nSthHNH5vB*SFB=Z!%JG6QYQ6QQ
z)*;gApqhA06DEIk#|;}#xQ$k^PgKN2h4;lzsJs8oViR;s)2@GCbQOoCZHz3fF}C(Q
qfa1UHAE6VACv;Pr;b_+uy%xw4`-#Vq1DqswFihHM;_r@d)@omG4`4+A

literal 459
zcmZ{gT}}cq6ot<nWDxKN?I55guE35Mi97I3UtB>gMM`F-&HNZ1S(gtkz(pB59Zd+v
zK78%H=k)fZpI`4E0A{%CARzQpGp`bLt+Rz8^qx(XOZA`=MHp;Jd?nrlA$;_1h7Mt5
z@>edbkW0m_(Oj*iN<>yNbP3(s&tF90=7iHbe#37W4hSu8I3h$lw~bk+3B!Oe*-;9a
zi&8GFm@}LbhPAw^GF>`aU8>xL(1iAk-}5QMkTCvhu_6~~5n)6)cWT_^j$Q7!DB|Df
z5hjGI|Mj>kwF`OC4Eaf66HzWqo^ol@)MUj5Aosz|3ea+g0DEY={RyFOhuGf$J@kEb
X=y~jU;>Zwr1~~J*vFCQ>-miP#lum3Q

diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class
index 34e3970b8849a70ef2bb080fe67086d83070cd94..2a720c718dbce28980eac8ad74ea97e6d1dfe7c0 100644
GIT binary patch
literal 1663
zcmb7^+invv5QcwK=z(&Mp)C~Xfm4CTIkbhgv_h!2NJt>=-CZX!WY??pCQa}9ScnTA
zfQLfNPSU7U>5Amy^Ex~Kcs%>tzyJLF1z;2VQ&<w1{OH0?+mx_e!b%CNB|MRMD)CI>
zxx@>JHHnuJuOwbetV@(7lte|MDp8ZDOKeDNN^D8Ik$5YyEwLl9EAdWZPhd9U{OdMu
zIDti%Hp@EELCcgAXUop@qITKSG}2yR=9}*7@}c%dpmZjbf)0(2DPo!<XfCiCxJX4d
zNS$|$ObwDK`Zv*;J+y6`9Sf|Cj&hBL4U96qz+9Ya5Y!(8)(ca0t+!6~YL#kDMcT#!
zYlZO?S=mydZF<`jSQs7K%{RJ6olyOzDQenqr`$Z{k9}q$#S?+$3t}lznCc@N(^_+R
zjLE!Joz$vcrMg|It8TR}P|4r8#KhF#hD#%z`Qd5<dDPDLNR<aIon``R3`xH&wJ{Wl
z4YE#3ZrB?`<df9s(6@}q4o>&{ehmGQOT#2}f$^UD^<OFa7CCT1Co*w%+M$lmT=XfW
zhNhV{<lg;)Dn_OVU6AYj*DuFOp5Vi{2~00DacIJ`Rcwr#gnZB{{sbe7PfeQ+qKkdY
zCRF?GxXXHSm<b0vFDjb8x2LxAVncuS%~mg1^o&o=skRDK|GMLxaHl}nqigTGZkmBR
z=;Yf>w?Ervtot6H&&5Y|eqW(;xvl6JhIBog0D`XU{!ic%J^a7~mS~*7<r5lkg=drb
zBNi~l<1}-Id6hZKyvDrFyurN5yv4lDyu&OpCG#%x9&?U4&s<>MXFgyqG9NM@F&{G-
Fe*tug_i_LL

literal 1757
zcmb7_TT|0O6vzJy%GC?nC>K$=cta)I3!s1?BIBDg&fxeSl5M-%WHZ^cls7(?4}1VW
zl;g>1=~Sj<rhWKrlbrv5H|Lz){Q3L)0>CCdk7Gn&Iy6DEq1JU&H3Cz|rkVKai*6`^
znZ8HvPp{<(jD6+k0>%XvO;U5c*z@bkjg5AVX@?Eh(q-t`0wx6}Gm(4ZSuz_dZMa3Z
zT)-`XLZ6Z}C(4URa7SQ*1$4{7jKHdILK$j5G1gR5*>#q5H}+C}q8mCrb8uf^WpJRW
zR<*CBYWs=|oofxdah<`zLxJ^N!<M$%$ac9{D$CH*k%Kvb<y^_BNdgB80&BTp<XPO3
zfv#CybFe5dKRCRVW#|dHQ6goh1d>Y7OA(hs+B2J~Q1XR?C0gS(;ba#i-l>jg(iMT(
zEKH?V%VwfwyI9&TR%EMGaqvu_m_0PHil|CelZ0Msd((DJ!bX-HdJ(_wC8>iK0&)md
zC#A0h%0q}^?WfH|Ie0CwH-yf{iShzlS1LWaOu<`$gCQ)k+Qy0Tm9><?o{O9B(&@G%
z<2OSUrI!h7+SG*K63TCqYGoZ11@?2+GSDS3er92Rd_RjbkFvnwupX+NswhxF|5`Q#
zHiq?~{-`_H$}h^mw@6fjcDadcUB~ni?*(>;o!nCYsi2#Mo&42PA6O~`PuXkWPAh&8
zsN_uD*Fsl>`vO}z!v7oRiuOQYCr8_+bN825Q{Bd)BSWWN<5<@sud@#h1?DpSX@x_I
zw2!wX?b(2imUBSRC!q5i!6^M1!42G`@d9I5qHz=x=fD)E`RX>^nZg3@(g@sR7MKs1
vv&?zsBj#h~Q|2;rmHC|clDWow!(3-dW{Fv0ZZh97x0$=lJ?2N|Cnn<`1Jw~z

diff --git a/poi-ooxml-lite/src/main/java9/module-info.java b/poi-ooxml-lite/src/main/java9/module-info.java
index ea4e1e60ce..2559d369d8 100644
--- a/poi-ooxml-lite/src/main/java9/module-info.java
+++ b/poi-ooxml-lite/src/main/java9/module-info.java
@@ -29,7 +29,6 @@ open module org.apache.poi.ooxml.schemas {
     exports com.microsoft.schemas.office.excel;
     exports com.microsoft.schemas.office.office;
     exports com.microsoft.schemas.office.visio.x2012.main;
-    exports com.microsoft.schemas.office.word;
     exports com.microsoft.schemas.office.x2006.digsig;
     exports com.microsoft.schemas.vml;
     exports org.apache.poi.schemas.ooxml.system.ooxml;
@@ -51,4 +50,4 @@ open module org.apache.poi.ooxml.schemas {
     exports org.openxmlformats.schemas.wordprocessingml.x2006.main;
     exports org.openxmlformats.schemas.xpackage.x2006.digitalSignature;
     exports org.w3.x2000.x09.xmldsig;
-}
+}
\ No newline at end of file
diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class
index fabf8f27eda563fa84f9f568220345986b015bfb..4996214ed462e0daeb3330200b66dfbfd7b4d19d 100644
GIT binary patch
delta 829
zcmXxiM^eKu0EOXaNDw8o$n@TOAVBC4dWX<^Cv;|5g>AS3r(lK}$O;x5fU|H021z_N
z|0l^K*&h3@_`4|Z_4Dxwz=x>7riHkft6=EzNMcK3TVh9IS7J|MU*bUGP$DRyt{zLA
zSaAA0?H;ehsf{xm=Qb|v+w1o{iF+Fl0*?Yu0?z_30ug~%fw$<26-f+RhyfgK#Ht$u
zE;w!!aOxn=RG7w_CYUCgCYicSlTA}pQ;}vmh;*~&HkGEfX@+U0X;w7k+O^a}EMQSB
zX#Y0qk>0A+o3(noRv)0%M`*L?Jk6##G?(Vld|E&Y!yFXRVp>8=X&Ei26||C8(f?Pe
z=Ddd1(mGmC!wnpGXd`W+UfN7sXe;&6Hrh@*XeaHW-L&V=FnYPrNBy*)4$wh5M2G1J
u9i?M*oKDb5Iz^|A{sqi%VU`By9Ccs`%UHpx`caqES6@>z3+rlbVdED*_DInH

delta 859
zcmXxi*-{fh6vpv?$3RyhD$?TyMo`qaF=mi}yAlys+)#+S2tk4gsj>=h!z)-mgjKH5
zxKw$;1NbaHfftrN<HyB(zdmQCrn{@o@18fk^<RH~t^j#{SRNbNCTdGBW=dn_O3Bbs
zt<5e~O8w=<xmvg|{c_sSI-ax~PaM9qQ55FFDCc<Um~qTHN{%`I-9Q)(hQ9yIG4Cil
z797tFE%|Ubj2xAKYQSRfs@TW|ybX94@IK&!<72=lOT+Tn^2O4$e6@VDd~f!dMq4ID
z${#ny8q$#Nq{UazPU|w**MHV#vg=syJC+Seb|kscCv^J95hPh?j<#1#9d5;Mm`L(=
zl6QO>CYh22Hfgn4ZjoE%HrXY+<?5fdtIo(Bvd8bAY}G4w%3ZQg?v{JxUYV8q<bHWT
z9+azBIi$K@)<Z20%bbklfIK1xWnK=+VR=*@lgH%=c~YMGZ=KU>oRMech%Cr+a#Ws|
zWAcK$C@;y&@`}7F#}lU}xu(W-c|+cm@qEP75Kl;KJR`AbirnQM_x&gqedmF%3=e&6
Gc=Qh%30(jH