From 09b62a9403326290a95abae2c4b933ce3a66d226 Mon Sep 17 00:00:00 2001 From: Radoslav Husar Date: Thu, 21 Mar 2024 17:46:06 +0100 Subject: [PATCH] Drop -XX:MaxPermSize=128m from the default JVM arguments which is not supported past JDK 8. --- tomcat-managed-10/src/test/resources/arquillian.xml | 2 +- .../container/tomcat/managed/TomcatManagedConfiguration.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tomcat-managed-10/src/test/resources/arquillian.xml b/tomcat-managed-10/src/test/resources/arquillian.xml index 18c7aa3e..5da1d050 100755 --- a/tomcat-managed-10/src/test/resources/arquillian.xml +++ b/tomcat-managed-10/src/test/resources/arquillian.xml @@ -5,7 +5,7 @@ ${test.catalina.home} ${test.catalina.base} - -Xmx1024m -XX:MaxPermSize=512m + -Xmx1024m ${test.jmx.port} ${test.http.port} server.xml diff --git a/tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedConfiguration.java b/tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedConfiguration.java index f8d39085..5b8a4074 100644 --- a/tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedConfiguration.java +++ b/tomcat-managed-common/src/main/java/org/jboss/arquillian/container/tomcat/managed/TomcatManagedConfiguration.java @@ -45,7 +45,7 @@ public class TomcatManagedConfiguration extends TomcatConfiguration { private String javaHome = System.getProperty(JAVA_HOME_ENV_PROPERTY); - private String javaVmArguments = "-Xmx512m -XX:MaxPermSize=128m"; + private String javaVmArguments = "-Xmx512m"; private int startupTimeoutInSeconds = 120; @@ -135,7 +135,7 @@ public String getJavaVmArguments() { } /** - * This will override the default ("-Xmx512m -XX:MaxPermSize=128m") startup JVM arguments. + * This will override the default ("-Xmx512m") startup JVM arguments. * * @param javaVmArguments * use as start up arguments