From 1dc4f7d08610d944df46c90c5320a4807bc3f282 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Thu, 26 Jan 2017 19:59:10 +0000
Subject: [PATCH] Need a fifth addopens-parameter for JDK 9

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1780457 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                  | 10 ++++++++++
 jenkins/create_jobs.groovy |  1 +
 2 files changed, 11 insertions(+)

diff --git a/build.xml b/build.xml
index 802f89c948..fdec999230 100644
--- a/build.xml
+++ b/build.xml
@@ -314,6 +314,7 @@ under the License.
     <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"/>
+    <property name="java9addopens5" value="-Dthis.is.a.dummy=true"/>
 
     <path id="main.classpath">
         <pathelement location="${main.commons-logging.jar}"/>
@@ -1268,6 +1269,7 @@ under the License.
                 <jvmarg value="${java9addopens2}" />
                 <jvmarg value="${java9addopens3}" />
                 <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${java9addopens5}" />
                 <jvmarg value="${file.leak.detector}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
@@ -1333,6 +1335,7 @@ under the License.
                 <jvmarg value="${java9addopens2}" />
                 <jvmarg value="${java9addopens3}" />
                 <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${java9addopens5}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${main.reports.test}">
@@ -1389,6 +1392,7 @@ under the License.
                 <jvmarg value="${java9addopens2}" />
                 <jvmarg value="${java9addopens3}" />
                 <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${java9addopens5}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${scratchpad.reports.test}">
@@ -1435,6 +1439,7 @@ under the License.
                   <jvmarg value="${java9addopens2}" />
                   <jvmarg value="${java9addopens3}" />
                   <jvmarg value="${java9addopens4}" />
+                  <jvmarg value="${java9addopens5}" />
                   <!-- jvmarg value="-Duser.timezone=UTC"/ -->
                   <jvmarg value="${file.leak.detector}" />
                   <formatter type="plain"/>
@@ -1467,6 +1472,7 @@ under the License.
                   <jvmarg value="${java9addopens2}" />
 				  <jvmarg value="${java9addopens3}" />
                   <jvmarg value="${java9addopens4}" />
+                  <jvmarg value="${java9addopens5}" />
                   <formatter type="plain"/>
                   <formatter type="xml"/>
                   <batchtest todir="${ooxml.reports.test}">
@@ -1516,6 +1522,7 @@ under the License.
                   <jvmarg value="${java9addopens2}" />
                   <jvmarg value="${java9addopens3}" />
                   <jvmarg value="${java9addopens4}" />
+                  <jvmarg value="${java9addopens5}" />
                   <!-- jvmarg value="-Duser.timezone=UTC"/ -->
                   <formatter type="plain"/>
                   <formatter type="xml"/>
@@ -1570,6 +1577,7 @@ under the License.
                 <jvmarg value="${java9addopens2}" />
                 <jvmarg value="${java9addopens3}" />
                 <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${java9addopens5}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
                 <batchtest todir="${integration.reports.test}">
@@ -1628,6 +1636,7 @@ under the License.
             <jvmarg value="${java9addopens2}" />
             <jvmarg value="${java9addopens3}" />
             <jvmarg value="${java9addopens4}" />
+            <jvmarg value="${java9addopens5}" />
             <jvmarg value="${file.leak.detector}" />
             <arg value="-ooxml"/>
             <arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>
@@ -1672,6 +1681,7 @@ under the License.
                 <jvmarg value="${java9addopens2}" />
                 <jvmarg value="${java9addopens3}" />
                 <jvmarg value="${java9addopens4}" />
+                <jvmarg value="${java9addopens5}" />
                 <jvmarg value="${file.leak.detector}" />
                 <formatter type="plain"/>
                 <formatter type="xml"/>
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 08e2101457..dc3f3483aa 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -35,6 +35,7 @@ def poijobs = [
                      '-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',
+                     '-Djava9addopens5=--add-opens=java.base/jdk.internal.ref=ALL-UNNAMED',
                      '-Djava.locale.providers=JRE,CLDR'],
         skipcigame: true
     ],
-- 
2.39.5