poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cen...@apache.org
Subject svn commit: r1776608 - in /poi/trunk: build.xml jenkins/create_jobs.groovy
Date Fri, 30 Dec 2016 17:00:14 GMT
Author: centic
Date: Fri Dec 30 17:00:13 2016
New Revision: 1776608

URL: http://svn.apache.org/viewvc?rev=1776608&view=rev
Log:
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.

Modified:
    poi/trunk/build.xml
    poi/trunk/jenkins/create_jobs.groovy

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1776608&r1=1776607&r2=1776608&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Dec 30 17:00:13 2016
@@ -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>

Modified: poi/trunk/jenkins/create_jobs.groovy
URL: http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1776608&r1=1776607&r2=1776608&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Fri Dec 30 17:00:13 2016
@@ -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,



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message