From edf41ca4d5b23dfaca8cc8d8bfcac63c0b144124 Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Fri, 7 Aug 2020 19:47:09 +0000
Subject: [PATCH] #64411 - Provide JigSaw modules - add jdk.unsupported module
 to main jar for CleanerUtil

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1880690 13f79535-47bb-0310-9956-ffa450edef68
---
 src/multimodule/poi/java9/module-info.class | Bin 3035 -> 3062 bytes
 src/multimodule/poi/java9/module-info.java  |   3 +++
 src/multimodule/poi/test9/module-info.class | Bin 3162 -> 3189 bytes
 src/multimodule/poi/test9/module-info.java  |   3 +++
 4 files changed, 6 insertions(+)

diff --git a/src/multimodule/poi/java9/module-info.class b/src/multimodule/poi/java9/module-info.class
index 7e09b989a9174f5d417877680e2b5fad428e7975..a8abd6c13b22fdeb9962d3ba55f99290a2cf98b1 100644
GIT binary patch
delta 941
zcmZuwOK1~O6uq~7nNOOgmcD%2m^4ZK;IGpnMT&@u6cG^>5mAvkB$G5Y&5Sb>+fqbD
z#D$2o7yoYDx=@Nc7vfq(mo7vQw}RM>OYy!m_`}7(yZ4=Q-?``B`H=daioX8w;w1o#
z!K20KXR8lV2tDV@)5Fb1(DXdl51q1veuTK|S1sGKOH+>JxitwHgaj2Z(J3KIIb0_O
z5!Q2J(6lOUBMc-IsDY`mA%yhbT+5jYeY+I8zJ&D%egE7}c|nCf;y~;V*e3df#q5^<
zfP<hSVH-k<&UQ$%>|BswA>=sfH)h<jQ<pGGXF4{D?Fhr1Ez*;YxEMngeYPVJ|E**P
zLcglf)n<(&45*kccWT_@PC6n|eAa2aGbVPe^3|oGvw+<Q`8GI?d+Ao^2C)xeu$?kA
zHblY%=LZdc-V0p``+wETix?iDZK8+=Ik#CHV#8=eB($)`;tx|?OUFv?%#7QRa8!xv
z)e>DLRYt-w^)AQpR&3eTTHTRwd?~UCPb@`pJ*~8Bdpxg`2tx`=^~f4=T3N(FY?U{s
zMsbE7N3uA%6iL(jNUyM!eui{cxMnaPgwBkF606Ch!^pJRsBs%rWdx(TJm2*kKb)6P
zBTp-cX@n##Ye{;;^2@$GYgHYWE4cKIE1aiq+FA_woQO38$8USyq+vaYvoxXS#k{g%
zMNb+w_qm{kv!eI&ATH9fk)>C9L|j5Ba&n-n<TirPRu*5OulkU<sy1;&&vo-A`qOHG
zueG6c%7}{V$_eI~m1d(9)|gCBjlAZCRS7q^dQsd&$WX!Tqi3d}Nw}p5tDza4a_ZbD
zulFM5%#0vqQ^8Eetddi&&)W5A3Abs|OygaeGxOp;!qzr7BOW3z<A})87jvWe76kuz
c048Okqk6J+-t+uebOHPBv;qKxd+qPRPaP}qApigX

delta 904
zcmZuwNoW&c6n<~=XOfvNwB~P<wAt*Uw4&3XMWjd-ks@MC5!WIzO{Pg`l8KX~rPhTa
z;z6pGhdW-p3Weg$gZ3yM6ulOTcox));HCJc=3?5zz`XDK-uBI#-@&z@{$b<ITL2h@
zXG{9GK?y;GX4}aaX30!tEu&=TB!m&#{>O}zT`1T^37rUWn!vb6LX^&9e>je?qfVPn
zPf6HG&oSE3jS#3~v!ycAz4QgU=re|>QE3o;ETeHHz*YB9Qi<SR8dbW5fzZWpnC`JA
ziLkF0X!K5L#{KkB>B2$!rNr<cwRqxqhz30UVhDM(1y4k9o5OU&(~HCO(-Uu~ZE)1x
zfN9k(RwNu_Y8M{o#8^uyH)B^S=49TIFya;&S0r5%8c%hC1wnof;7NKQqIimyMFPj@
zlZfLu{Sdu)nufix#>rgKbmpAY0SRXq=o9A<x@kqU2b{T5#VA+IV%l`l5-uRbT%2Bc
zbuobu;-F1UTQd?aabk$Rdt31`ZFqao<X)l1f|+vcvV>Gks}*y$1j`+hGwG_Tiwr_!
zGkBqDLpg-@I_JxIBkh>85~dM4x95zEWfy2w4bdO9;jE1i+^WkJ%nUnpW!oavvgH))
zw3U}oMrf_i<^`&B(U-tkn)gM;9734ZePLC?yt~P|uR}E}B?;GQ&9__JbWLK65`I-I
zARo=YK<LJl?Mz$j<1H3O$@c5ww(GRZ+kU@~``oD&q*cF{UixEN)ji9*JT<Loo!oJ8
z^V4XNrmU4OSq`V%XU~`nsFfVgzeHnNPX}$i;OZv*kQTKBKBi?YiBIXPHln=;!G9Kj
Yp9b`#?+CQJ!RxF(k4*pwk8018zmoj)Z~y=R

diff --git a/src/multimodule/poi/java9/module-info.java b/src/multimodule/poi/java9/module-info.java
index 50a41b014f..1ae77363e7 100644
--- a/src/multimodule/poi/java9/module-info.java
+++ b/src/multimodule/poi/java9/module-info.java
@@ -24,6 +24,9 @@ module org.apache.poi.poi {
     requires java.logging;
     requires java.desktop;
 
+    /* needed for CleanerUtil */
+    requires jdk.unsupported;
+
     uses org.apache.poi.ss.usermodel.WorkbookProvider;
 
     provides org.apache.poi.ss.usermodel.WorkbookProvider with org.apache.poi.hssf.usermodel.HSSFWorkbookFactory;
diff --git a/src/multimodule/poi/test9/module-info.class b/src/multimodule/poi/test9/module-info.class
index 01d4a48243e5225ad84ae01b9874ae6d6165660a..7695551235910ee70f64d82eafe1be242afbc3ad 100644
GIT binary patch
delta 981
zcmZWoU279T6umc{&F&_#Y3;O4lcvqKinL-=ks@MC6)7SjDk35xvQ5@BZIWF#o7z%T
zL_|dVC>IsKKYxJWTOSmC6cL~O1A?G$J}K5avBg>+c4p4KXJ*blclJ}_dm{4g*TO3R
z7=q{Xk<VlC$^6tntx~Odp6drrz6ClEw8>hf7_>kNVNJye2F7OtXS|lr&q_!mG`fBv
zYkPKX!pVAWQ9?Iam_&<)aUJ%Ojs08KBdq<GmCff*O4xvqSQU3>0^iOBt}mgFtWZmX
zS3OBTFd18s*hIgu2eX_`h|LJ?bV^7w?@UYBg3zT9RYEZ_gwRt53!%oagslhzOR!UH
zLrB-bw@_4UN9a%>T6XhJNx}$1vYs4lFmRMIqN~X+6nv*(2ToPO&gH#L!qB;jT?m;v
zopEHs_5%rH2-b2a>XyrHMZ#`mXOuRknQnzyd;YTGxR>wg7yJI4oo<k@p9Af5QM8DI
zY!mNnHG?9nJA{xTOKYQ#LKlaXR7*>8eMgiGOG_Dcp;&Sx9HlO;50CNK70>yzUf|ju
zcjq`lucFZnEh0`RzZisPl;JkL*3y{c9SQobH48^6wzO924#z~{&$X>)+0OYc+fZb7
z!mJcs2~$cn6QiE*dX69P!zk0Wu!SzY2&eEAy$@%wN?&=bQKR08r)i^}8J<OGUe*38
zA3Vo5{TI%z=>HkzN8D&LY&P+nYF^yvV8_nW8@)$dP;HMJ$!N~4R0CTXeUV~DFJ7WS
zqhDNJO4DP*VArlFJDANdidXr7bl3|D60WPISyQicURAzmrkG8Ny=ZnuCY%x%%3^QQ
zu$dCKl~bc;TP&M%N~P0wX-dK!I%6jA9^EoC;(-#0AxR%hT|8QTF9#ZQ!z)g^feugT
yr@0xQ(LiLk`2__3kN{CS8yV4)_4SUIZzFTqd$$fkaGz&30Uj>R2#*=7@9A&sSMbCD

delta 877
zcmZWoO=uHQ5S~e1cC$%St$AtFr1@#m+8?knXb~wzi-<_k5=1-{(M_^#*CxARvq=p_
zR76CI*fNOJ`d6=lD4tXhy^7#b@T4Gk5_|Dh#J3@W*281p%r`%8zHjzt_*2;T?$^uL
z05A%VR(#(kJ?CnMZU><oAz*0sNWNif`C75q;1ES<H?7%>T2TvgTBc&^9AXHee|?#P
zSuUFfhXm!Y4|}PO!<eRZ?81I}fw9N{LU2pUT%|h0VTd*`ML#f1!!AGDCBi7{4!SvH
zXv)>YvIueE;Pk=e@s`b^R^qUSmR$pE6k()=^x!@^%evaM^R}fHY}4YfpSHQ<I7TDx
z1dh{j_b?uCLTK6TXA=lX>R>(coNCz|4pBQx_*?HkjA8_VNv0v7BLdoqM@4=-P|@qA
zZL9f`#$i&_O0i=I{q&55XpQZ_DSE<Un4<|Pto$M41bt@-JV^mhKRbocN83G7C9fN*
z)vyYCX}71B7CnA8jgWRAf7MovqG}a6oTjIqG&_S3rVSQSidvn6>QoRG`J@h3aNa45
zz>Hqfs*S3xl{sjldy>tzvLr({Ip}mrO0ju_o@VYVNx?GZl%P_|6fJdugGpbcBz=}T
zhyJ3kiqN%1u4*Zxm(^J@eNAM9+G<tJY6-GHs@#bU;SSQ09Kc0dm1FDzLN{&7-9pQY
z^wt}bRJ+3AGF7}Wf59}IVFkrksMnijR~;%h<w(0$S4){0)0)==3)e*K0K4wcBQUz*
z^|C65B~dIzZ@h7-Rul_#v)Oh`@rynyG^h+BiTR><i^@u0<o5r2SF?4oM62{zN#Yv4
zSK{oRvk*CV)Z5fph6mK)%d&NZY*XH8Uq<-~O#ChYJ|f?^d=Mgz@%*E25o0d6Bkl;D
OaJThExG!wyJp2uACF-L9

diff --git a/src/multimodule/poi/test9/module-info.java b/src/multimodule/poi/test9/module-info.java
index 26579cd98d..74dbd6d1a6 100644
--- a/src/multimodule/poi/test9/module-info.java
+++ b/src/multimodule/poi/test9/module-info.java
@@ -24,6 +24,9 @@ module org.apache.poi.poi {
     requires java.logging;
     requires java.desktop;
 
+    /* needed for CleanerUtil */
+    requires jdk.unsupported;
+
     uses org.apache.poi.ss.usermodel.WorkbookProvider;
 
     provides org.apache.poi.ss.usermodel.WorkbookProvider with org.apache.poi.hssf.usermodel.HSSFWorkbookFactory;
-- 
2.39.5