From 1ee199b1ea8ce524d734aa5e9fa7fbe0c4a52ac0 Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Sat, 22 Jan 2022 14:35:20 +0000
Subject: [PATCH] try to fix build for Java 9+

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1897344 13f79535-47bb-0310-9956-ffa450edef68
---
 poi-excelant/build.gradle                     |   2 ++
 poi-excelant/src/test/java9/module-info.class | Bin 422 -> 423 bytes
 poi-integration/build.gradle                  |   2 ++
 .../src/main/java9/module-info.class          | Bin 278 -> 278 bytes
 poi-ooxml/src/main/java9/module-info.class    | Bin 3841 -> 3841 bytes
 poi-ooxml/src/test/java9/module-info.class    | Bin 5228 -> 5228 bytes
 .../src/main/java9/module-info.class          | Bin 2696 -> 2696 bytes
 .../src/test/java9/module-info.class          | Bin 3343 -> 3343 bytes
 poi/src/test/java9/module-info.class          | Bin 4198 -> 4198 bytes
 9 files changed, 4 insertions(+)

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index ee538601b6..8e6b437ed1 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -172,12 +172,14 @@ test {
         jvmArgs += [
             "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
         ]
+        /*
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
             jvmArgs += [
                 '--add-modules', MODULE_NAME,
                 '--module-path', '../build/dist/maven/poi-excelant-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
             ]
         }
+        */
     }
 }
 
diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
index 53c59b85a32e7e7fa2fdaf491385a578c430e454..bc5c4be45ea8a67f04ec4d26a72a894ec9de6555 100644
GIT binary patch
literal 423
zcmZ{gOHRWu6h-e#Nkdyc1*f!h!V0h(q)M!yV#0_OnBan|IF9l`9d=y|x_~YU;kZat
zAUwGCJI{Vc^6v9v3t*0Egdw5-WScTo3!N##(AbwIQ@1)_TE3F+lF)thh~a|ak`N^c
zpYdeIz!+kN5h0xOdw$1o6=NJ@!f;I(91J3iZTZS&A=5X-3#++Wrz(?qP3W}}{wyme
z?|2gbx@+y)WQ0+RS52;KmxZoX=>}@T<S#E|DNRL~x|Y~mg|mvP5<lXb|C^$zwKKNQ
zzl}vE>!mFXPpvUFuQmX=FWj#Hfjb1~;K=O{2t5wb-2f4eebw{XcR9d`&j6>Mo%uYh
I2<I*P0?_<oFaQ7m

delta 238
zcmZ3^yo_1;)W2Q(7#J8#8Kl@5m>3zjbMsS5b5eCP^V0Gs@@g}(Pb`#D5oX|IWZ=w7
zEKAf&N-R!gWMDHi(KFC95@z6GWMEFrD-mYkn>bfoO_)J|kwG-SC|xhBG%vFRNET$4
zq!#HV7GyFqu$t<bgR}@wJR{94!XP^Fxh$IqgE%9D{KQvM9QvgtnK{A?l9SaKbwZhe
z4q{?pVPFN)9t><ik^#u(XkcLAV&Dezc)=t;kQ8JP0+UP(B49BwFp11#WRL)f0RST|
BCjtNf

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 0ce1d61e15..cd3ff04c67 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -170,12 +170,14 @@ test {
         jvmArgs += [
             "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
         ]
+        /*
         if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
             jvmArgs += [
                 '--add-modules', MODULE_NAME,
                 '--module-path', '../build/dist/maven/poi-integration-tests' + File.pathSeparator + files(MODULE_RUNTIME_PATH).asPath,
             ]
         }
+        */
         if (NO_SCRATCHPAD) {
             systemProperty 'scratchpad.ignore', 'true'
         }
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 e5bdb0c1d947f6940b00d3df09d1f58237b5e260..9ef3959781dedb451f74d641f749170d86f1799d 100644
GIT binary patch
delta 11
ScmbQnG>vIO2&4JL(1QRK&I9xS

delta 11
ScmbQnG>vIO2&37=(1QRK$^-KN

diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
index 6b3411cb4da43953dfbd6a8f7edfa1b7d247bf65..e6ae9b24f192466de10635727015e9eb8f51dd13 100644
GIT binary patch
delta 12
TcmZpaYm}Ri#b~}Udm0}A8#n|p

delta 12
TcmZpaYm}Ri#b~lIdm0}A8z}@X

diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
index 62e9c00111d9ce333a8891479a2870f6a17a1636..48fd3276288b4ec91caf4c4fbccad4ed39a2eade 100644
GIT binary patch
delta 12
TcmaE(@kV1p3ZwbPRCW;nBi;mt

delta 12
TcmaE(@kV1p3Zu!!RCW;nBhLhb

diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
index 1e8a22e5293b78c4be540456b5361b55217c4985..559f2cc250f86106811fc4dbe76fc4787dbee327 100644
GIT binary patch
delta 12
TcmeAW?GT+1$7sGWUXu#|8OQ^q

delta 12
TcmeAW?GT+1$7r%KUXu#|8My<Y

diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
index 5e9f24ad13603248b2c9879d46a4a4778a6a46cb..385430d0919e062d86108372150f9de0218441a5 100644
GIT binary patch
delta 12
TcmeB|>X(`j!DzlQavKi-8>R$5

delta 12
TcmeB|>X(`j!DzBEavKi-8<zw;

diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class
index c8b29ddc20b7bb94b88c7e8d874c2c3cd7e3433a..5f441458ec0d77b531b2c44f7f6a93395463aeee 100644
GIT binary patch
delta 12
TcmaE+@JwMsETiGZI1T{-B2)xZ

delta 12
TcmaE+@JwMsETh53I1T{-B2NTT