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
This commit is contained in:
Dominik Stadler 2016-05-29 21:33:28 +00:00
parent a9f9290bb7
commit a48bfc0281

View File

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