From 78516f50dc46beee5b6deb1edd678a91eb128f79 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Tue, 27 Dec 2022 18:45:15 +0000
Subject: [PATCH] try to get rid of cached module-info classes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1906232 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle                                  |  26 ++++++------
 poi-examples/build.gradle                     |  19 +--------
 poi-examples/src/main/java9/module-info.class | Bin 979 -> 0 bytes
 poi-excelant/build.gradle                     |  38 ++---------------
 poi-excelant/src/main/java9/module-info.class | Bin 306 -> 0 bytes
 poi-excelant/src/test/java9/module-info.class | Bin 373 -> 0 bytes
 poi-integration/build.gradle                  |  19 +--------
 .../src/test/java9/module-info.class          | Bin 685 -> 0 bytes
 poi-ooxml-full/build.gradle                   |  17 +-------
 .../src/main/java9/module-info.class          | Bin 2611 -> 0 bytes
 poi-ooxml-lite-agent/build.gradle             |  17 +-------
 .../src/main/java9/module-info.class          | Bin 219 -> 0 bytes
 poi-ooxml-lite/build.gradle                   |  15 +------
 .../src/main/java9/module-info.class          | Bin 1867 -> 0 bytes
 poi-ooxml/build.gradle                        |  34 +--------------
 poi-ooxml/src/main/java9/module-info.class    | Bin 3753 -> 0 bytes
 poi-ooxml/src/test/java9/module-info.class    | Bin 5140 -> 0 bytes
 poi-scratchpad/build.gradle                   |  34 +--------------
 .../src/main/java9/module-info.class          | Bin 2637 -> 0 bytes
 .../src/test/java9/module-info.class          | Bin 3284 -> 0 bytes
 poi/build.gradle                              |  40 ++----------------
 poi/src/main/java9/module-info.class          | Bin 3386 -> 0 bytes
 poi/src/test/java9/module-info.class          | Bin 4199 -> 0 bytes
 23 files changed, 32 insertions(+), 227 deletions(-)
 delete mode 100644 poi-examples/src/main/java9/module-info.class
 delete mode 100644 poi-excelant/src/main/java9/module-info.class
 delete mode 100644 poi-excelant/src/test/java9/module-info.class
 delete mode 100644 poi-integration/src/test/java9/module-info.class
 delete mode 100644 poi-ooxml-full/src/main/java9/module-info.class
 delete mode 100644 poi-ooxml-lite-agent/src/main/java9/module-info.class
 delete mode 100644 poi-ooxml-lite/src/main/java9/module-info.class
 delete mode 100644 poi-ooxml/src/main/java9/module-info.class
 delete mode 100644 poi-ooxml/src/test/java9/module-info.class
 delete mode 100644 poi-scratchpad/src/main/java9/module-info.class
 delete mode 100644 poi-scratchpad/src/test/java9/module-info.class
 delete mode 100644 poi/src/main/java9/module-info.class
 delete mode 100644 poi/src/test/java9/module-info.class

diff --git a/build.gradle b/build.gradle
index 3a7c4d7a8e..c37eb38e37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -821,19 +821,19 @@ task soLinkCheck() {
 }
 
 var srcDep = [
-    ':poi:cacheJava9',
-    ':poi:cacheTest9',
-    ':poi-ooxml-full:cacheJava9',
-    ':poi-ooxml-lite-agent:cacheJava9',
-    ':poi-ooxml:cacheJava9',
-    ':poi-ooxml:cacheTest9',
-    ':poi-scratchpad:cacheJava9',
-    ':poi-scratchpad:cacheTest9',
-    ':poi-excelant:cacheJava9',
-    ':poi-excelant:cacheTest9',
-    ':poi-examples:cacheJava9',
-    ':poi-integration:cacheTest9',
-    ':poi-ooxml-lite:cacheJava9',
+    ':poi:compileJava9',
+    ':poi:compileTest9',
+    ':poi-ooxml-full:compileJava9',
+    ':poi-ooxml-lite-agent:compileJava9',
+    ':poi-ooxml:compileJava9',
+    ':poi-ooxml:compileTest9',
+    ':poi-scratchpad:compileJava9',
+    ':poi-scratchpad:compileTest9',
+    ':poi-excelant:compileJava9',
+    ':poi-excelant:compileTest9',
+    ':poi-examples:compileJava9',
+    ':poi-integration:compileTest9',
+    ':poi-ooxml-lite:compileJava9',
     ':poi-ooxml-lite:generateModuleInfo'
 ]
 
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 855ba38b03..8ce4abd87e 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -19,9 +19,7 @@ import java.util.regex.Pattern
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
     }
 }
 
@@ -72,24 +70,11 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 jar {
-    dependsOn cacheJava9
+    dependsOn compileJava9
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
     }
diff --git a/poi-examples/src/main/java9/module-info.class b/poi-examples/src/main/java9/module-info.class
deleted file mode 100644
index bd60029c1c7f655c74d19b007767bbcdc49de05b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 979
zcmb7@$xeho5QhIAml^j_%6;F)9h`&l>dBiYpP<Da2Ll74LGk9%XY$|!_)x~OjAmj2
zi6ndt_5XAgKjHo3^$oxo+I1`|j9$li>YK|TGz!fqzRg2(67)K;d#@j~!tj-p9IQB4
zRj9Yy?y1{8cd+JQ-N6Q7ldwhDChQP)2`$1NVV`h7I3yeqjtM6Om*5dj6~_9SD9p#{
zovRb=ca59GfolpKC84njBVPl!H`?-G^v4y)MHDJ5{wZ5O)tTQ-^sPce9v9mx+q~}{
z9{2EmdU$^Nlw=AkWqLQUohsRe)pEr0QR(K^c0BW7dRcBw%Apv3qgJK6&saY5W5QjR
z%J#9G>{hwxb>cM2L;mpV6{c?Xm44|6c@|X3g~V2xOYyH<#BH<G=qTvjRRk!;z5q*;
zE;vB%*Z2%5{$0M08ftt|!vF?(eZi2F2QmB%)X~5O-;dyeIm%}pO^ophj0-1(lfo%s
ZQ#dW05jsK=&I;#*^TGw;qHswl_ykrl4LSe-

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 8c67febfd0..1b394fe994 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -23,14 +23,10 @@ configurations {
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
     }
     test {
-        if (jdkVersion > 8) {
-            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
-        }
+        output.dir(TEST9_OUT, builtBy: 'compileTest9')
     }
 }
 
@@ -82,13 +78,6 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
 
@@ -107,24 +96,11 @@ task compileTest9(type: JavaCompile) {
 }
 
 
-task cacheTest9(type: Copy) {
-    dependsOn 'compileTest9'
-
-    from(file(TEST9_OUT + VERSIONS9))
-    into(TEST9_SRC)
-}
-
 jar {
-    dependsOn cacheJava9
+    dependsOn compileJava9
 
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
     }
@@ -146,19 +122,13 @@ sourcesJar {
 
 // Create a separate jar for test-code to depend on it in other projects
 // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
+task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
 
     classifier 'tests'
     // ignore second module-info.class from main
     duplicatesStrategy = 'exclude'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from TEST9_SRC include '*.class'
-        }
-    }
-
     from sourceSets.test.output + sourceSets.main.output
 
     manifest {
diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
deleted file mode 100644
index 4df3dfdf05d5de17ac2ec327ad609a0b4fa77a1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 306
zcmZ`#OAY}+5Pda+@&ENC5*sJbZ4%-Jc2-W%Mq{LDF-9z%%fbO1O0>2h61{k@>UGtt
zRNWuf8-Nj5fGVLpGua_llSC^*b88lvR{dnRG<+jZl2DjBiJ`_&Cj?Q%2Rs@xG#Hv8
zS|Qqm%2ywuV-71W_cC59zBdV1=U8dEI}%DSPd=Bao#i_v{HZnOyw!xRmBrgaSPPM+
w;^Wf$|0%L#qAvj14d2g$X9EvDa+Zh4JK0C!0t6_!tmM!`*>T08y^LcEPyUZX#Q*>R

diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
deleted file mode 100644
index 281315a4d42f27a1dcffaa20eb202f81637936f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 373
zcmZ{gT}}cq6h^-b4v6?m2Qa?40^7udgeCamBI;12WIAo89m6B*^1%hTC}UepG#dMG
za_@I<dy>9?yuJZgU_QhdVen{IU9A|-87>$u8Lk*6gkr&${GNf8C`(KkW`wcHyLY--
zTf*G7&s;iLZ4`G_bG55fEt^0XZRLyPPtq$wKPTm{U2AuyCQMVj?HU~-oervv4{E~o
z-`vSo8c(>1BXO{bXcgXzZ}IK_L(v5tjp_QA(bY1nZEJXCjj@g20~9~za0tCvJfNT3
c0!RB)6bTq)4kM2-%Ix7JXXDJD9pN-(pQx=?MgRZ+

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 94db71b5aa..9b46ca3940 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -29,9 +29,7 @@ configurations {
 
 sourceSets {
     test {
-        if (jdkVersion > 8) {
-            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
-        }
+        output.dir(TEST9_OUT, builtBy: 'compileTest9')
         if (IBMVM) {
             java {
                 exclude '**/HeapDump**'
@@ -121,13 +119,6 @@ task compileTest9(type: JavaCompile) {
 }
 
 
-task cacheTest9(type: Copy) {
-    dependsOn 'compileTest9'
-
-    from(file(TEST9_OUT + VERSIONS9))
-    into(TEST9_SRC)
-}
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
@@ -138,19 +129,13 @@ jar {
 
 // Create a separate jar for test-code to depend on it in other projects
 // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
+task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
 
     classifier 'tests'
     // ignore second module-info.class from main
     duplicatesStrategy = 'exclude'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from TEST9_SRC include '*.class'
-        }
-    }
-
     from sourceSets.test.output + sourceSets.main.output
 
     manifest {
diff --git a/poi-integration/src/test/java9/module-info.class b/poi-integration/src/test/java9/module-info.class
deleted file mode 100644
index 1efde427394e78c2a33ce553f46c28d6cd172659..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 685
zcmZ9K+foxT7{~u9LOE5DfFP)N1P^1%cFO1zc;}T*kY+=hlHKeiS*E??xxDZJd??3n
zvvp>1FMeOX^I`V)pP#<~T;Wq6Ck)#^T<w+qW~^q|D_mY%{n?b)PR!-4WZ3wgOdO{i
z&lvhyCN4#G$?=?gBawX(8OIBT^(*mJj5y9XUXmvh*+`5zUU9tUc*F6Q;~mF2#|6iG
z3LgtfKEMZ#j|@AVz6^)XPlc?cnrTrvBSQ2#1ct3<A~BJHCOz)NST~)Taw<rU=d1L2
zU79H7b!DRVRLrbW?%ONrWkHn(rH*2<jCxY%`I2Ebb;@<PiLPQe>oilYC|ntYa@J}U
z4ZX(<N1cdfWWA6@Wi^$4`kyB#FQb}OGG{pL_<}5BExmDKQP`l>Ds$rMQZ1DX(b6%z
zyEVD?s~zwAZp?yVzp1EPu4l3ibU3*fwZX&oo<kaL`0t)4O>ldV%F1}{d_lQsy*q%>
zPttxp^ytyU8Xl0eSWo5wHtv8vHc8vUHgN~Li38$8JR<h7M+6=x?kDoZgT%wcC&VM_
Mcbv3V()x||7ez#;Z~y=R

diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
index 03e6bb335e..ee9edd81d5 100644
--- a/poi-ooxml-full/build.gradle
+++ b/poi-ooxml-full/build.gradle
@@ -26,9 +26,7 @@ sourceSets {
         // TypeSystemHolder.class is in the resources
         output.dir(BEANS_RES, builtBy: 'generate_beans')
         compileClasspath += files(BEANS_RES)
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
         java {
             srcDirs = [BEANS_SRC]
         }
@@ -73,13 +71,6 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 task copy_xsds(type: Copy) {
     from ('src/main/xmlschema/org/apache/poi/xdgf')
     from ('src/main/xmlschema/org/apache/poi/schemas') {
@@ -142,12 +133,6 @@ task sourceJar(type: Jar) {
 jar {
     dependsOn 'sourceJar'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes ('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
     }
diff --git a/poi-ooxml-full/src/main/java9/module-info.class b/poi-ooxml-full/src/main/java9/module-info.class
deleted file mode 100644
index 365080ac1b98ca2324d34968260507aed1e24b6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2611
zcmb7`TXz#T5XWbrB~UJ<SS^=w3$z8=#&YZs67H7(y+BI~rS$S5@5;7{ceO{79p{bD
z#X~<pKNN@2tdCDfljUq4ezugE|BR&3$p5{0{VxDqhQH@v7sCF`rlX-=FnP}+?0L+i
z27HKc(z<?A6)G9%W?@a!+DSHSdKzZRH((B7-#==snqB2}1NI>_HaU=KSF4=t_9N_N
zJDL)35aE1cGntvhS#NtmP6Z{+7Alyo8Je&m;A4dL_J+3CGl`a|Q|l)0%SpS{T9K(y
zeWx-3pCFv8^wX0>QzDHW6PfCl9|Ar_xKJrr*mdn_gYqEYD8ijeV_!I}Qa{i-WW$*I
z;))D|IHyx`%yb^Sfa3^v>&diR|C4D8_#9!OQfF+uv7AO*X3FFOP9e-!x~yB53OIw%
ze6QJ5IC{jhpGUY<=@XA~nU1pWO<%xygyY+rkE7a`q(%iN%L<ir0JBo!N|k=Y2c1bC
z2)ID&+QFRUro|-S62j4Frh_+f<cyrO7FSyxIbQ4t_-4m{E(usbXhlz3=$uNuXI-X(
zpXD@-P#!w1G8rgG1tSrz)b&~`D__7O-H{s3vpdqM7j$TompZ+t^0A`Yyo?}g1TCxT
zO1(@AlZ27e0#*@j)CjiecFi{F8p7=w60ukdXA|u`b(fjS4TS3zDrK`+v&kslVD3rF
zvTM3SW2r3_18Qiu5N_2~h()53pq=r-B((W=su#0u8p+59n>}$<m@XJiD)$gpYp230
zFXGL+k8rcDduo%Ifq(vNqlhUyqz+eCLr;RvsZVZR%J&FMb#>@o4g~yIU0U02rPD)t
zqHOL5rl3VUMz~ftxTho4>2w!<uFjs`3Qy(4A!m)FyimU&bSgrZkLn}Sb;@l_%dvEP
z`X0xv?-RAE((yNh<%)>!-kUAi{*G|9!goSHGG3~_o+e5UfC*~&)bw*zwt+vY8`c*8
zEvNJs!m${9y~Fw~YU!(zI&?~}%qsw-A4BCI!fqNKfe+v;P3(p}uj2e(9(@$Q!bLd1
zpNE)-nMas{`5E&V^91uG^EC4;^BnUF=2y&%%&(c>GMmg6v&~#$E;Cn{SDDwDH<`DY
gcbRL<2h8u7KQJFLe_}pi{>psDe9nBq{FBLe3z_IAp8x;=

diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
index f6cfff98a3..7ce9832275 100644
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -17,9 +17,7 @@
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
     }
 }
 
@@ -57,22 +55,9 @@ task compileJava9(type: JavaCompile) {
     }
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes (
             'Automatic-Module-Name' : MODULE_NAME,
diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
deleted file mode 100644
index d445b14e8af144ec4261ddb4cd9efcccb7e8bc6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmXAjJraU26ofaTAmUFE8*gA^QrUX}&)@`!7zYRg!I6%0S$F^s<(Pz5?0mb$H}Cs<
ze*he@jxZ+(&pPW0NfA>lC=!b07Au0J^!q_oH%+k9P0mCuu6N05t(exYvbYq=NP_qw
zo`R*KwY>4Hs@61JDJw%jD`{BT8<}=l)-#d&)%p17<JQN$k2~K05c}SE1QQE;1il8C
Q4i0865aMK$AaZ5AKgjtpLI3~&

diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 7286d4d07e..28879d6fa5 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -22,9 +22,7 @@ final String BEANS_RES = "${buildDir}/generated-resources"
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
         compileClasspath += files(BEANS_RES)
         java {
             srcDirs += BEANS_SRC
@@ -116,11 +114,6 @@ task compileJava9(type: JavaCompile, dependsOn: 'compileJava') {
     }
 }
 
-task cacheJava9(type: Copy, dependsOn: 'compileJava9') {
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
@@ -138,12 +131,6 @@ jar {
         }
     }
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     // ignore second module-info.class from poi-ooxml-full
     // duplicatesStrategy = 'exclude'
     includeEmptyDirs = false
diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class
deleted file mode 100644
index 61cdb0a1b8ed9ad1d72863186c161d73fa319cde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index eb585bec80..1c2ffca5c9 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -35,14 +35,10 @@ configurations {
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
     }
     test {
-        if (jdkVersion > 8) {
-            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
-        }
+        output.dir(TEST9_OUT, builtBy: 'compileTest9')
     }
 }
 
@@ -175,13 +171,6 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava', ':poi:testJar'
 
@@ -200,22 +189,9 @@ task compileTest9(type: JavaCompile) {
 }
 
 
-task cacheTest9(type: Copy) {
-    dependsOn 'compileTest9'
-
-    from(file(TEST9_OUT + VERSIONS9))
-    into(TEST9_SRC)
-}
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
     }
@@ -230,12 +206,6 @@ task testJar(type: Jar, dependsOn: testClasses) {
     // ignore second module-info.class from main
     duplicatesStrategy = 'exclude'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from TEST9_SRC include '*.class'
-        }
-    }
-
     from sourceSets.test.output + sourceSets.main.output
 
     manifest {
diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
deleted file mode 100644
index 505565a8cae63f9e96062fee72b09e2483fa7a26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3753
zcma)<hj-gV7{I?Pw4r-Q-IFfb(nw93LMf{hno>w;si6%USvt!~ES)&Xj#Ea%-h1!8
z_l5#x!+ZQuJU)GLWLuJHllOj+?!JBB-6{Y4d-NCpY=ghMU=oAruCS^V-tBlL!C=ZD
zy(uu6fhwe}8NOkbx#kN;6Qb@`6zF0wb=asGTG0r&0#g~xO9`T|0@E2NE#s(K<c1e0
zFq6TumWjl&7N8^7K#AE5R<=l(!gYlgXr`!CxEVV5+^4`?28(iqEN&{GFj$&9>-v%h
z=wm*E`8fiPP+%d0nG-%;BP?%KU@?Ok1>cYX-{ph_9xAZ3-F-#aw&U3v{_PvaGWKdc
z+qEqUtUyI7RzpC6RTCo?4@N@aE3g_XNHPI8tI`R_v|&36aV>+{G>)~?OgZL<7~J~y
z!~(+$tA=!hhC-;Xzy=13qr{4$>X~Dv5rh?7J}GLB#iat98hN)*k2rM&HZz!3G(u-Y
zGd#ytKw~hg@je=A)zHDk--6M{V@2s$Hm-j!wop7`3MzdchCMOh1tA8AxtxJb(-@3W
z+n&5y0zK_WUU?mBdrtCd*YNecBrd0CyQjd;BnDa$Olns$5}4BQQRgBC3u1pk*^u1Q
zaMeXsnjD??<N7w{YPLoJT--EJvu%z}F2VLqgd|pxOXqM@zyStx;)zgVKSxR9=w(Ta
zah>)jDbSudfY$KAmWE$;%&3*Ar4_h>!Q7TM^sQ1+;8GlH-&7^xg)}~dd&lCM6e0df
zEf&`%%=TI;T+LuP8r0)`tK;s{>!W^2$HGd(L?soj?I2POxWvPNS5&w@Zla8p#`KLj
z7A(8XNs+;dbR4mW$$i?xDp(!Nv;<OOurAL`BBEo{N9I&0Gtf>*RJXZsc__zJz^%IG
zI67s+=PFc=Z#)vjGB?xn7%a>)j*Xy#AD<s>6^`l?wT}w2!)z3}3SoRUx9ZZ_tU@iT
zM>D#`Ybw;UYZA}4G{@oW%EvNsV7KHgnT26Dd*?O=t21f0is&KwQ(-)>_HA+|Ze0|-
zBP%F;?qM1GhT95$SA4Uy)g=)WzNx}J*>-B0LJ8gRaHD$$F2Q{adQxfRi|Q`k3uOcE
zCK;&k0E4Y3rdIXZ6d%e~w&^b}{v+{~+L~WI2udnEmeq|WS~vX@Ijce<HI6q(bM>C;
zV5&vrnQRfsTOy*DdBvw{JjY-|sv0R#Yz6KG(Vecs3k;UzNf#Z@h<58s+1?~;jZ^8B
z4xtC3<c5p4vkI?e_eUHL?YcMeW-BG#lE$bCZ{?Y9%+isf!aE&AlFF#?US1AprIEu2
z9YTm3;G_7%sI>v`fG-6)eI4jl;9!oQFj$|eVp>Qq872?0;-6*LCnJl!QFHL(RN;&N
zcOP=s?}D!wY)ZLLju(CR#4WVH@j=oB-!Rygl208<`u=@;hXw}{-F~{q#=77;2Afl=
zLC`#k^g}|96onXRIy;)()Tw?PDir!B^b$uuGU!e_s<b#NRPf`fP!^+2PsbSarc~+y
zu5;1~`cPq@KT%9v{lZ{vN-wBT2kLuW!{!ILhaVhVcEN89Hl`%WL)5K$;ozQ>_#fFD
z3=KEK8N?e=6rxM4nZ#e&0_P;r)Eoz3_^(C$!{8)<Nju<Vdff<9#-oQ*U=?y2aRzZ#
zGz@cy^N1>O0dWy=333@Mr{|T#Q;BPc>tHATJ&m}LcsjA0s1tjLTZ!9<XA;jMo=rTL
zcs}t0;)TTB#685l#7l{T#C^oei3Q@7#6!exxQb%DhIk$E2BJYUiJWK?9pVVlB?{tA
z#DG{OjuOX+Hxq9q9wFXNypwo0@m}Kn#0QBF6CWi$PJEL1H1S#D^TZd4FB4xSzD|6T
w_%`uf;`_u8i60X`C4Nq15JkkW4*({^m-zHGe2e@Zen9>NKO=vI-;sa*2OSbeEdT%j

diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
deleted file mode 100644
index 0585f8f7e59072ded4a4c23fd805322ac17156cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5140
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

diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index fcce89bc2e..9caafbd3f4 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -24,14 +24,10 @@ configurations {
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
     }
     test {
-        if (jdkVersion > 8) {
-            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
-        }
+        output.dir(TEST9_OUT, builtBy: 'compileTest9')
     }
 }
 
@@ -78,13 +74,6 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava', ':poi:jar'
 
@@ -103,22 +92,9 @@ task compileTest9(type: JavaCompile) {
 }
 
 
-task cacheTest9(type: Copy) {
-    dependsOn 'compileTest9'
-
-    from(file(TEST9_OUT + VERSIONS9))
-    into(TEST9_SRC)
-}
-
 jar {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
-
     manifest {
         attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
     }
@@ -133,12 +109,6 @@ task testJar(type: Jar, dependsOn: testClasses) {
     // ignore second module-info.class from main
     duplicatesStrategy = 'exclude'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from TEST9_SRC include '*.class'
-        }
-    }
-
     from sourceSets.test.output + sourceSets.main.output
 
     manifest {
diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
deleted file mode 100644
index 9a3a927772b8f5de3a9b219c58fbbe6387a97ed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2637
zcmai$X@A>95XK*IRFt+H)s)_CC<RI(7EN2uLb(!BNNB0KZ&}({N+e5_WIN#u=ZE42
zAAk?VkJ+&!+tM2R;;;2SGn$>**|q=v=g+?YT*V(Y-m<W7Jq`M?a<J@R#lhPSRvp}M
z@Q#Cb9jp=73GWeZ5^fRRC)_5q2_FzXBz#2pnD7bVQ^IG2&k0`;z9f7__?qwy!6S4C
zJ|Q3|!UmyB2ni8kldwgI2??P`NC_F?4k0HLgp$xF3<yKQHerYGE#W)D_k<s8{AlAR
z8@o1sw(*ONUv2zm<97=O63JyT>TRSJj;DFI<z=29s#capt-{Z}(hoB)u&{sA8+fgb
zS11dIYj$jF;h-1<s@N*i%)%i*O_H=%v=XljFIzY=<+CS69P^lA-cJMN&q{IH?MA(B
zi=S6EEjaAuj#lb&bT>@YhJ~YsSvODv3#Uzr+Aed?FVlRE?v-U8b^0Y|+=v%+P4Rek
z6z^m`o>q!7S6)&WqG@$%HK$D8oMx|7IlG@R$!gnISs8J~Eu1hJ_+h`d#bP6sVP;B&
zXGf{%4Vo#nR*Ec740&kDPkRHE^GfIFQ+YOaMf>*)m2+3Bc+`)L&||GpBke1itJ~_V
zY1JdS+{u)wNW)~q&6S_#-0jVzSqyS-XiAEusYTb5s`7QySS=aqpLI<2=h-=}tCi}d
zh9YTwT%?716)MfW<9DKx%g{J8MLZ7N=pwD`6{wzNsKu#OHF|WUPkPk&f~hh#c0j+N
z6Gwct=xb`GEwnVw_`+PxEqQrao@U&fk!}EEgnk)u<24so%rti63>ArK4|#UZ9*W|X
z-nbW=@!0b}t10@VnvMHL2gtmf&k|?a*bK$$XeV7BS~yp)+N?nq_f7TEMsv=DmZmnd
zReOICPgHkZm3i6@y-eN8(?JyIo8w~5p{j+uymx6&jIYf#)+f%rxwgF2u71fX{}s9V
zcPuQ{+-DZoj(I`tFda_9E!FI$^{Zsv)%My-<y8eaUvuIhx^(W1#Otcts>fNI@(%T-
zB!;Uz`ak2n4RKd_G-JFASo{}e^s#Uke;wd%`D){yT|KxL3(S3b2wQlcaKG?=;Uyf9
z=Rx5i;RC`4g%1fI79JKlLJ}SkJ|a9SJSIFYJRv+OJS99WJR>|STo67gJSTiicwYFp
z@Co6Q!VAKugcpTR3!f1#3R^-~_^j}fa7lPsctv<s_?+;0;S0hSg)a$T7V2tW<NChB
R&sTAs`5Ip5s=t9Z{{`oA@Kpc+

diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
deleted file mode 100644
index 21de811871ea20a71217f15ffa83ca3e2aa73a97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3284
zcmai0>3Z8#5It&X-O`k$p3=PyrIb>L1!)5X3X~-wg@l%deOGM7R$^JIBqu3r*!TTy
z_`w74P<+f8JC1G1kRRvBckb1lIcM%w{{H9BzW_|(j}l&Ruya1DwVQq!b7jnz@nRWQ
z%D7s_OJ!Vhuw$xnp)y&<LK!a$UJ<-1cunxS;0?i>g0}>33*HgDD|k=vzQ7YK3aWyd
zz!xkD>Vk$K5G)H;1WiFGXbB=gEVwR61gRhsv<0hzHNm>zhTsFihk}m;9}7Mad@9%w
zd?xr@@P*(@!B>K>%lJm{t>8Ps_a*#L!jC2VRKm|C{8GZNCHz*x?+*5aR^>#{T8bPT
zijsQ8i@j>Yuf$PMNvnyMRU5HabFh2aTlFf7Ug|s8H#AS@IvBGFH9uX+qS(RSY7~Z1
zE3JfH);Q<jVBeZ%RIdlEdPVvCvV;8$Ew@`irWgmApJ)>LMq4sC9(#!wrkXdGgi&=R
z$TaV={&G8cyPAvJ2>m4o2MR{rn!oDcSW(1Z&l0biMahV`mt{$?*v_>6+<vus(SADG
z+3(2kevG79;#)1bY#8m!=4jDsEwiOUsT9YH!v1>IkF!AacW}69LbcIut!OY;%354h
zijH<lp(g`UGm^$hSfCn1)u^@VCz|Pqcwe149k{-o`ib_a-|Tc}ZtHF=rxDj$%nh_b
zP84O`31>HAzeuFDaLG;lYLsa2=Zn^0E%DZhiqcSD(!)jd>UE>0KUtuEyjY~aj*e(u
zMtUzT5Q*`wNaMpQ^kVMy>SB<o47oFtHoF_=x`>fYfrhJWFxZz>u17oZtsX6WL7$8{
z2l#@;W}p`hFRg*LV5nR1nUOI!)AZsbinTcdHbCJH?JUs7%O{r(G<NO`rD2hWIy%Bb
zi+GvW?Zy0ly7E8OwD^{qx%-A2=+&ubNh{5n;cK+xq^pk(P7bR!I3aGfi}d285ody-
zJ~K}jy}zN8_~!mX*>l|wL)`STr6>t2-OozF$x+`6M)e#Qm}^&ynOhl3CT(t|>dyOF
z5-l{m*uR=Yt3i#|*x8{4J!9PI%`eE-<clLG^Z2`0=B6hXdLP-|`WgEU-Ec55w0t1B
zg{CI7(1_NywwoN9Z|AV5ygR!vH`80y+vL>HBHe^Ox|c(*?qBm;T6Iy~4c?G8aaN!H
zZ}Mh$xU>2+FnI%T^#88TpM!0{_E~JVpSy6=1|N1{TyZBKQ8L_RxLfgN>@gg(ktyso
zzQyoX!`lpRH{54fHWb7ChIbeqFg$2@$ndb?5yPW~#|)1fo-iCYywmWc;a!HO4DU8P
zZFrC28N+)G&l=umc)#I<Va3oje8BKQ!%4$)hUX2Z3?DLl*zkhkBZiL}K4y5)@NvT@
z6dgQ?OI?1d%TITC3aoG&#&phj?}^%S71bqEUosUYQ)4n!CR1lJl_pbbGSwziZ!#4p
zQ*$y^CsTJal_yhsGIb|!X1kd^J>WQ9AkzmjogmW-GTk844>BDg(-ZQgF4G<Uraxpl
zM5ae%x<sZ=WI9ErS7f?Hre9<_My6+Ex<;mNWI9KtcVxOprhnv3*XSgF(@V00XY|B8
Rt2~Vv#pf`q-d)D?{{mR~MP>j1

diff --git a/poi/build.gradle b/poi/build.gradle
index ab2590b76e..c67e02d86a 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -24,18 +24,14 @@ configurations {
 
 sourceSets {
     main {
-        if (jdkVersion > 8) {
-            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
-        }
+        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
         java {
             // also include the generated Version.java
             srcDirs += 'build/generated-sources'
         }
     }
     test {
-        if (jdkVersion > 8) {
-            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
-        }
+        output.dir(TEST9_OUT, builtBy: 'compileTest9')
     }
 }
 
@@ -46,7 +42,6 @@ dependencies {
     api "commons-io:commons-io:${commonsIoVersion}"
     api 'com.zaxxer:SparseBitSet:1.2'
     api "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-    // implementation 'javax.activation:activation:1.1.1'
 
     testImplementation 'org.reflections:reflections:0.10.2'
     testImplementation 'org.apache.ant:ant:1.10.12'
@@ -107,13 +102,6 @@ task compileJava9(type: JavaCompile) {
     ]
 }
 
-task cacheJava9(type: Copy) {
-    dependsOn 'compileJava9'
-
-    from(file(JAVA9_OUT + VERSIONS9))
-    into(JAVA9_SRC)
-}
-
 task compileTest9(type: JavaCompile) {
     dependsOn 'compileTestJava'
 
@@ -131,22 +119,8 @@ task compileTest9(type: JavaCompile) {
     classpath = files()
 }
 
-
-task cacheTest9(type: Copy) {
-    dependsOn 'compileTest9'
-
-    from(file(TEST9_OUT + VERSIONS9))
-    into(TEST9_SRC)
-}
-
 jar {
-    dependsOn cacheJava9
-
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from JAVA9_SRC include '*.class'
-        }
-    }
+    dependsOn compileJava9
 
     manifest {
         attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@@ -155,19 +129,13 @@ jar {
 
 // Create a separate jar for test-code to depend on it in other projects
 // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ]) {
+task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ]) {
     destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
 
     classifier 'tests'
     // ignore second module-info.class from main
     duplicatesStrategy = 'exclude'
 
-    if (jdkVersion == 8) {
-        into('META-INF/versions/9') {
-            from TEST9_SRC include '*.class'
-        }
-    }
-
     from sourceSets.test.output + sourceSets.main.output
 
     manifest {
diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class
deleted file mode 100644
index a0332da1c11c6fdacf04d601a3fc1469738a9a8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3386
zcmai$_kP?&5XXNqkR!cl(tD$XSh5p`5LzG*lK_Dv2ZRo?w09?;P7;#t&Zfom-h1!$
z5%_}#;3;?#K8)s?qLUqeKK|;oGdnvwGdrt){`>210Eh5r2@h&mQVyDtttMShX;{?=
zoTjHnUB40-(^kvUu;`Qw>3B%T!x~EC<HndVeptsNIv&;Wn2yJFJfY)BRy|;hA2G&s
zSURS3*aU~52o*w=P$Rg6X+oXg5gG)a5D-GbQ-p{R6B0s`&?2-6GlW^f(}ZUT&k~*^
zJWn`Jm?OMEc#-fD;bp=rgjWf#5nd;}L3oq!7U6BeJA`)$?-AZ7d_ee+@Dbr-!Y71J
z37-)@CwxKplJFJbYr;2#ZwcQKz9;-Z__2haO8B{iUrPA3gx^Z|y@WqBEX_nn!<rzf
z8dhl8HD!c>oBnH9oCeOAvSJSC_KboZG#Y^)8+PD%%1&JVJ)vPkp@ySu4QmTTZlGa#
z&r-umY6mqeD~DDTt7C3bR>_4Hy`Wlk{i?ywiD}jp*SdqfS4YM5BnUOEoObF)(~p~B
z7(|J3G^}6`%+CHy*<0#TX29%t(%I+mxY>+V!~s*DhP{O|2O4H2@RPU`(yS%NsdToK
z9aJ+(WZ6j&Y0z_aYhlb2wib+<nOTMMw(`8XAGG}ft8r>|Tiz;<nyRJzq`S#o^D1N_
zVO(6vbefIEY^3ZU;w%g~E6WZ-u(8Ns*P~5EvYz35PHL&)j?lEK)ksyXL~%|E9q8)W
z9G4yQFJjs?E8?QuxsZw+jNu~6x?^*7T*OK=8zy`@7TQ$kwt^(FrqW(lxT#E<3hnge
zW=(maia0pw0nXN@c->4~uKCS55g(yS+&?q<)O4lkHiko*5prszS??*fp3XO?T;Gaj
zBYQ%_LTa|e%nG?{?OwoIoLIhNrKOlZ0a>?Z(&LzqMn}O>t@#|0<5S@c#j|mu8pBo4
zv5?g$4r{}*qo5!ko%w#+IP)p*h{7n~OeV7$wiL!7=00OpxnkDk#Ia{Ok<}i~b5~$i
zRlpm{yUWr{Ct5#j)NROe1@rplr(tz|9&deUMx0$KpPD%4o*VHUq9NZwx}v7X9{~BF
z4P>U3@U4;Wc^Nq$+O%|dfqdO$lvK+qxE^u}si*byMp|ICO4FBHb-0!@#(GKxT`i*(
zCe;Nu-b^p0f@o**lRr;vy)PX!kD-!cEomL;heNijq|;eo+I&Z~Ew4U&MHRQ4b~sp8
z!@iu=ejS>}d)LY7C}_Ek;-kDjr+mQ<&T&4bf}lQ7AI+<KgO$y)$2QBgpgqvf_od#U
zIhj`fS>>}2sTX;(1D8)(uHSciQa%Ux43FpB=(OYBcZhkST%PRt-k*~XOV1VlqH0*-
z1rE&t8h<@^{zfpuKSpo~F6H5WahVJ+!J;{!gv;e^ad#|zES2BOgv*&Lu##EAD&cD3
zQLN!7pbJU3R=7^MUbsQHQMgICS-3^GRk%&KUARNIQ@BgGTewHKS9pc+O5s()tA+c7
z*9i9uM}>ya6pjhUg$INOg%iR<!fS<xh1Us>2(K63AiPm{lkjHYQQ<AZTZPAjw+U|-
z9v4mu?+~64o)q3Gyi0hu@RaZ#;l0AsLU10>;4I3xk8^s4Gkrh5X?TF&HJtk&k*L@L

diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class
deleted file mode 100644
index 7e8007f7772cacd8fd3672535163fc4f9f0586a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4199
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