Author: centic
Date: Sun May 29 21:33:28 2016
New Revision: 1746059
URL: http://svn.apache.org/viewvc?rev=1746059&view=rev
Log:
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
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1746059&r1=1746058&r2=1746059&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Sun May 29 21:33:28 2016
@@ -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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
