MaxPermSize is not used any more in Java 8, so remove it everywhere

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2017-09-17 11:07:28 +00:00
parent bbd9adc5f0
commit 7c21c8761a
5 changed files with 6 additions and 13 deletions

View File

@ -28,7 +28,7 @@ under the License.
Some people may find the tests hang when run through Ant. If this Some people may find the tests hang when run through Ant. If this
happens to you, try giving Ant some more memory when you run it, eg: happens to you, try giving Ant some more memory when you run it, eg:
ANT_OPTS="-Xmx1024m -XX:MaxPermSize=256m" ant test ANT_OPTS="-Xmx1024m" ant test
--> -->
<project name="POI Build" default="help" basedir="." <project name="POI Build" default="help" basedir="."
@ -305,8 +305,6 @@ under the License.
<propertyref name="version.id"/> <!-- to detect if we are running on slow Gump VM --> <propertyref name="version.id"/> <!-- to detect if we are running on slow Gump VM -->
</propertyset> </propertyset>
<!-- this needs to be overwriten to empty when running with Java 9 -->
<property name="maxpermsize" value="-XX:MaxPermSize=256m"/>
<!-- these need to be set differently when running with Java 9 --> <!-- these need to be set differently when running with Java 9 -->
<property name="java9addmods" value="-Dthis.is.a.dummy=true"/> <property name="java9addmods" value="-Dthis.is.a.dummy=true"/>
<property name="javadoc9addmods" value="-J-Dthis.is.a.dummy=true"/> <property name="javadoc9addmods" value="-J-Dthis.is.a.dummy=true"/>
@ -1486,7 +1484,6 @@ under the License.
<path refid="test.jar.classpath"/> <path refid="test.jar.classpath"/>
</classpath> </classpath>
<syspropertyset refid="junit.properties"/> <syspropertyset refid="junit.properties"/>
<jvmarg value="${maxpermsize}"/>
<jvmarg value="-Xmx768M"/> <jvmarg value="-Xmx768M"/>
<jvmarg value="-ea"/> <jvmarg value="-ea"/>
<jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmods}" />
@ -1570,7 +1567,6 @@ 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="${maxpermsize}"/>
<jvmarg value="-Xmx768M"/> <jvmarg value="-Xmx768M"/>
<jvmarg value="-ea"/> <jvmarg value="-ea"/>
<jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmods}" />
@ -1685,7 +1681,6 @@ 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="${maxpermsize}"/>
<jvmarg value="-Xmx512m"/> <jvmarg value="-Xmx512m"/>
<jvmarg value="${java9addmods}" /> <jvmarg value="${java9addmods}" />
<jvmarg value="${java9addmodsvalue}" /> <jvmarg value="${java9addmodsvalue}" />

View File

@ -36,8 +36,7 @@ def poijobs = [
skipcigame: true skipcigame: true
], ],
[ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays, [ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays,
properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true', properties: ['-Djava9addmods=--add-modules=java.xml.bind',
'-Djava9addmods=--add-modules=java.xml.bind',
'-Djavadoc9addmods=--add-modules=java.xml.bind', '-Djavadoc9addmods=--add-modules=java.xml.bind',
'-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true', '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
'-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED', '-Djava9addopens1=--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED',
@ -251,7 +250,6 @@ poijobs.each { poijob ->
rootPOM('sonar/pom.xml') rootPOM('sonar/pom.xml')
mavenOpts('-Xmx2g') mavenOpts('-Xmx2g')
mavenOpts('-Xms256m') mavenOpts('-Xms256m')
mavenOpts('-XX:MaxPermSize=512m')
mavenOpts('-XX:-OmitStackTraceInFastThrow') mavenOpts('-XX:-OmitStackTraceInFastThrow')
localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE) localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE)
mavenInstallation('maven-3.2.1') mavenInstallation('maven-3.2.1')

View File

@ -103,7 +103,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${maven.plugin.surefire.version}</version> <version>${maven.plugin.surefire.version}</version>
<configuration> <configuration>
<argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine> <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:-OmitStackTraceInFastThrow</argLine>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

View File

@ -93,7 +93,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${maven.plugin.surefire.version}</version> <version>${maven.plugin.surefire.version}</version>
<configuration> <configuration>
<argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:MaxPermSize=256m -XX:-OmitStackTraceInFastThrow</argLine> <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:-OmitStackTraceInFastThrow</argLine>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

View File

@ -156,7 +156,7 @@
</activation> </activation>
<properties> <properties>
<maven.compiler.maxmem>512m</maven.compiler.maxmem> <maven.compiler.maxmem>512m</maven.compiler.maxmem>
<argLine>-Xmx768m -XX:MaxPermSize=128m</argLine> <argLine>-Xmx768m</argLine>
</properties> </properties>
</profile> </profile>
@ -170,7 +170,7 @@
</activation> </activation>
<properties> <properties>
<maven.compiler.maxmem>768m</maven.compiler.maxmem> <maven.compiler.maxmem>768m</maven.compiler.maxmem>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine> <argLine>-Xmx1024m</argLine>
</properties> </properties>
</profile> </profile>