From: Dominik Stadler <centic@apache.org>
Date: Sun, 29 May 2016 21:33:28 +0000 (+0000)
Subject: Prepare build.xml for initial Java 9 testing:
X-Git-Tag: REL_3_15_BETA2~221
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d86bfc72d7457b0669fe7dd9d0b3e3f7347bcfb;p=poi.git

Prepare build.xml for initial Java 9 testing:
* Allow to remove PermGenSize, this is not available any more in Java 9
* Allow to pass in java.locale.providers

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1746059 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index e906c8f255..72faf4578a 100644
--- a/build.xml
+++ b/build.xml
@@ -286,7 +286,11 @@ under the License.
         <propertyref name="user.country"/>
         <propertyref name="javax.xml.stream.XMLInputFactory"/>
     	<propertyref name="org.apache.commons.logging.Log"/>
+        <propertyref name="java.locale.providers"/>		<!-- required for Java 9 compilation -->
     </propertyset>
+    
+    <!-- this can be overwriten to empty when running with Java 9 -->
+    <property name="maxpermsize" value="-XX:MaxPermSize=256m"/>
 
     <path id="main.classpath">
         <pathelement location="${main.commons-logging.jar}"/>
@@ -1353,7 +1357,7 @@ under the License.
                      failureproperty="ooxml.test.failed">
                   <classpath refid="@{classpath}"/>
                   <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="-XX:MaxPermSize=256m"/>
+                    <jvmarg value="${maxpermsize}"/>
                     <jvmarg value="-Xmx768M"/>
                   <jvmarg value="-ea"/>
                     <!-- jvmarg value="-Duser.timezone=UTC"/ -->
@@ -1419,7 +1423,7 @@ under the License.
                      failureproperty="ooxml.ss.test.failed">
                   <classpath refid="@{classpath}"/>
                   <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="-XX:MaxPermSize=256m"/>
+                    <jvmarg value="${maxpermsize}"/>
                     <jvmarg value="-Xmx768M"/>
                   <jvmarg value="-ea"/>
                     <!-- jvmarg value="-Duser.timezone=UTC"/ -->
@@ -1503,7 +1507,7 @@ under the License.
             <classpath refid="test.ooxml.classpath"/>
             <classpath refid="ooxml.xmlsec.classpath"/>
             <syspropertyset refid="junit.properties"/>
-            <jvmarg value="-XX:MaxPermSize=256m"/>
+            <jvmarg value="${maxpermsize}"/>
             <jvmarg value="-Xmx512m"/>
             <arg value="-ooxml"/>
             <arg value="${ooxml.lite-merged.dir}/ooxml-lite-merged.jar"/>