From 7c21c8761af8f72b9d9a67f860a5bda4b15146f8 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Sun, 17 Sep 2017 11:07:28 +0000
Subject: [PATCH] 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
---
 build.xml                  | 7 +------
 jenkins/create_jobs.groovy | 4 +---
 sonar/main/pom.xml         | 2 +-
 sonar/ooxml/pom.xml        | 2 +-
 sonar/pom.xml              | 4 ++--
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index 0a5da7d8b..455dada53 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,7 @@ under the License.
 
     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:
-          ANT_OPTS="-Xmx1024m -XX:MaxPermSize=256m" ant test
+          ANT_OPTS="-Xmx1024m" ant test
 
  -->
 <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 -->
     </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 -->
     <property name="java9addmods" value="-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"/>
                   </classpath>
                   <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="${maxpermsize}"/>
                     <jvmarg value="-Xmx768M"/>
                   <jvmarg value="-ea"/>
                   <jvmarg value="${java9addmods}" />
@@ -1570,7 +1567,6 @@ under the License.
                      failureproperty="ooxml.ss.test.failed">
                   <classpath refid="@{classpath}"/>
                   <syspropertyset refid="junit.properties"/>
-                    <jvmarg value="${maxpermsize}"/>
                     <jvmarg value="-Xmx768M"/>
                   <jvmarg value="-ea"/>
                   <jvmarg value="${java9addmods}" />
@@ -1685,7 +1681,6 @@ under the License.
             <classpath refid="test.ooxml.classpath"/>
             <classpath refid="ooxml.xmlsec.classpath"/>
             <syspropertyset refid="junit.properties"/>
-            <jvmarg value="${maxpermsize}"/>
             <jvmarg value="-Xmx512m"/>
             <jvmarg value="${java9addmods}" />
             <jvmarg value="${java9addmodsvalue}" />
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 23553e808..6873a302c 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -36,8 +36,7 @@ def poijobs = [
           skipcigame: true
         ],
         [ name: 'POI-DSL-1.9', jdk: '1.9', trigger: triggerSundays,
-          properties: ['-Dmaxpermsize=-Dthis.is.a.dummy=true',
-                       '-Djava9addmods=--add-modules=java.xml.bind',
+          properties: ['-Djava9addmods=--add-modules=java.xml.bind',
                        '-Djavadoc9addmods=--add-modules=java.xml.bind',
                        '-Djava9addmodsvalue=-Dsun.reflect.debugModuleAccessChecks=true',
                        '-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')
                     mavenOpts('-Xmx2g')
                     mavenOpts('-Xms256m')
-                    mavenOpts('-XX:MaxPermSize=512m')
                     mavenOpts('-XX:-OmitStackTraceInFastThrow')
                     localRepository(LocalRepositoryLocation.LOCAL_TO_WORKSPACE)
                     mavenInstallation('maven-3.2.1')
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 0695148dd..cac9f5834 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -103,7 +103,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <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>
             </plugin>
 		</plugins>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index ed10f74b0..934c19dd1 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -93,7 +93,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <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>
             </plugin>
 		</plugins>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 6d37111ad..5505e9ba7 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -156,7 +156,7 @@
 			</activation>
 			<properties>
 				<maven.compiler.maxmem>512m</maven.compiler.maxmem>
-                <argLine>-Xmx768m -XX:MaxPermSize=128m</argLine>
+                <argLine>-Xmx768m</argLine>
 			</properties>
 		</profile>
 		
@@ -170,7 +170,7 @@
 			</activation>
 			<properties>
 				<maven.compiler.maxmem>768m</maven.compiler.maxmem>
-                <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                <argLine>-Xmx1024m</argLine>
 			</properties>
 		</profile>