From 02f2481d219c156f1acc6a5980550767de342a73 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Fri, 30 Dec 2016 17:00:13 +0000
Subject: [PATCH] Allow to set the new --add-opens argument for JDK 9,
 scratchpad tests require slightly more memory on JDK 9 now, also adjust the
 Jenkins DSL accordingly.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1776608 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                  | 52 +++++++++++++++++++++++++++++++++++---
 jenkins/create_jobs.groovy |  9 ++++++-
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index dce47631c2..a913bc3ac7 100644
--- a/build.xml
+++ b/build.xml
@@ -307,6 +307,10 @@ under the License.
     <property name="maxpermsize" value="-XX:MaxPermSize=256m"/>
     <property name="java9addmods" value="-Dthis.is.a.dummy=true"/>
     <property name="java9addmodsvalue" value="-Dthis.is.a.dummy=true"/>
+    <property name="java9addopens1" value="-Dthis.is.a.dummy=true"/>
+    <property name="java9addopens2" value="-Dthis.is.a.dummy=true"/>
+    <property name="java9addopens3" value="-Dthis.is.a.dummy=true"/>
+    <property name="java9addopens4" value="-Dthis.is.a.dummy=true"/>
 
     <path id="main.classpath">
         <pathelement location="${main.commons-logging.jar}"/>
@@ -1260,6 +1264,11 @@ under the License.
                 <!-- jvmarg value="-Duser.timezone=UTC"/ -->
                 <jvmarg value="${java9addmods}" />
                 <jvmarg value="${java9addmodsvalue}" />
+                <jvmarg value="${java9addopens1}" />
+                <jvmarg value="${java9addopens2}" />
+                <jvmarg value="${java9addopens3}" />
+                <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${file.leak.detector}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${main.reports.test}">
@@ -1320,6 +1329,10 @@ under the License.
                 <!-- jvmarg value="-Duser.timezone=UTC"/ -->
                 <jvmarg value="${java9addmods}" />
                 <jvmarg value="${java9addmodsvalue}" />
+                <jvmarg value="${java9addopens1}" />
+                <jvmarg value="${java9addopens2}" />
+                <jvmarg value="${java9addopens3}" />
+                <jvmarg value="${java9addopens4}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${main.reports.test}">
@@ -1368,9 +1381,13 @@ under the License.
                   Without the line below tests fail on Mac OS X with jdk-1.6.26
                   and on Windows with jdk-1.5.22
                 -->
-                <jvmarg value="-Xmx256M"/>
+                <jvmarg value="-Xmx512m"/>
                 <jvmarg value="${java9addmods}" />
                 <jvmarg value="${java9addmodsvalue}" />
+                <jvmarg value="${java9addopens1}" />
+                <jvmarg value="${java9addopens2}" />
+                <jvmarg value="${java9addopens3}" />
+                <jvmarg value="${java9addopens4}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${scratchpad.reports.test}">
@@ -1413,7 +1430,12 @@ under the License.
                   <jvmarg value="-ea"/>
                   <jvmarg value="${java9addmods}" />
                   <jvmarg value="${java9addmodsvalue}" />
-                    <!-- jvmarg value="-Duser.timezone=UTC"/ -->
+                  <jvmarg value="${java9addopens1}" />
+                  <jvmarg value="${java9addopens2}" />
+                  <jvmarg value="${java9addopens3}" />
+                  <jvmarg value="${java9addopens4}" />
+                  <!-- jvmarg value="-Duser.timezone=UTC"/ -->
+                  <jvmarg value="${file.leak.detector}" />
                   <formatter type="plain"/>
                   <formatter type="xml"/>
                   <batchtest todir="${ooxml.reports.test}">
@@ -1440,6 +1462,10 @@ under the License.
                   <jvmarg value="-ea"/>
                   <jvmarg value="${java9addmods}" />
                   <jvmarg value="${java9addmodsvalue}" />
+                  <jvmarg value="${java9addopens1}" />
+                  <jvmarg value="${java9addopens2}" />
+				  <jvmarg value="${java9addopens3}" />
+                  <jvmarg value="${java9addopens4}" />
                   <formatter type="plain"/>
                   <formatter type="xml"/>
                   <batchtest todir="${ooxml.reports.test}">
@@ -1485,7 +1511,11 @@ under the License.
                   <jvmarg value="-ea"/>
                   <jvmarg value="${java9addmods}" />
                   <jvmarg value="${java9addmodsvalue}" />
-                    <!-- jvmarg value="-Duser.timezone=UTC"/ -->
+                  <jvmarg value="${java9addopens1}" />
+                  <jvmarg value="${java9addopens2}" />
+                  <jvmarg value="${java9addopens3}" />
+                  <jvmarg value="${java9addopens4}" />
+                  <!-- jvmarg value="-Duser.timezone=UTC"/ -->
                   <formatter type="plain"/>
                   <formatter type="xml"/>
                   <batchtest todir="${ooxml.reports.test}">
@@ -1535,6 +1565,10 @@ under the License.
                 <jvmarg value="-Xmx1512M"/>
                 <jvmarg value="${java9addmods}" />
                 <jvmarg value="${java9addmodsvalue}" />
+                <jvmarg value="${java9addopens1}" />
+                <jvmarg value="${java9addopens2}" />
+                <jvmarg value="${java9addopens3}" />
+                <jvmarg value="${java9addopens4}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${integration.reports.test}">
@@ -1589,6 +1623,11 @@ under the License.
             <jvmarg value="-Xmx512m"/>
             <jvmarg value="${java9addmods}" />
             <jvmarg value="${java9addmodsvalue}" />
+            <jvmarg value="${java9addopens1}" />
+            <jvmarg value="${java9addopens2}" />
+            <jvmarg value="${java9addopens3}" />
+            <jvmarg value="${java9addopens4}" />
+            <jvmarg value="${file.leak.detector}" />
             <arg value="-ooxml"/>
             <arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
             <arg value="-test"/>
@@ -1628,6 +1667,11 @@ under the License.
                 <jvmarg value="-ea"/>
                 <jvmarg value="${java9addmods}" />
                 <jvmarg value="${java9addmodsvalue}" />
+                <jvmarg value="${java9addopens1}" />
+                <jvmarg value="${java9addopens2}" />
+                <jvmarg value="${java9addopens3}" />
+                <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${file.leak.detector}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${excelant.reports.test}">
@@ -2690,4 +2734,4 @@ under the License.
     </section>
 ]]></echo>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 9973acb2eb..1c6712ec07 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -27,7 +27,14 @@ def poijobs = [
         skipcigame: true
     ],
     [ name: 'POI-DSL-1.9', jdks: ['1.9'], trigger: triggerSundays,
-        properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', '-Djava9addmods=--add-modules=java.xml.bind', '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true', '-Djava.locale.providers=JRE,CLDR'],
+        properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true',
+                     '-Djava9addmods=--add-modules=java.xml.bind',
+                     '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
+                     '-Djava9addopens1=--add-opens=java.base/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
+                     '-Djava9addopens2=--add-opens=java.base/java.io=ALL-UNNAMED',
+                     '-Djava9addopens3=--add-opens=java.base/java.nio=ALL-UNNAMED',
+                     '-Djava9addopens4=--add-opens=java.base/java.lang=ALL-UNNAMED',
+                     '-Djava.locale.providers=JRE,CLDR'],
         email: 'centic@apache.org', skipcigame: true
     ],
     [ name: 'POI-DSL-IBM-JDK', jdks: ['IBMJDK'], trigger: triggerSundays, noScratchpad: true,