[tomee] branch master updated: Avoid passing old arguments to the JVM, it makes JDK 11 to crash

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new a2d4323  Avoid passing old arguments to the JVM, it makes JDK 11 to 
crash
a2d4323 is described below

commit a2d4323e2e4c5b2e02f56147ffbf4561c155303a
Author: Jean-Louis Monteiro <jeano...@gmail.com>
AuthorDate: Tue Aug 20 16:07:22 2019 +0200

    Avoid passing old arguments to the JVM, it makes JDK 11 to crash
---
 tck/cdi-embedded/pom.xml                        | 15 ++++++++++++++-
 tck/cdi-tomee/pom.xml                           | 14 ++++++++++++++
 tck/cdi-tomee/src/test/resources/arquillian.xml |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index e341b3c..0927cc0 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <testngSuiteXml>src/test/resources/passing.xml</testngSuiteXml>
+    <surefire.argline/>
   </properties>
 
   <dependencies>
@@ -200,7 +201,7 @@
         <configuration>
           <reuseForks>true</reuseForks>
           <forkCount>1</forkCount>
-          <argLine>-Xmx1536m -XX:PermSize=512m -XX:MaxPermSize=512m 
-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled 
-XX:+CMSPermGenSweepingEnabled</argLine>
+          <argLine>${surefire.argline}</argLine>
           <useFile>false</useFile>
           <disableXmlReport>true</disableXmlReport>
           <suiteXmlFiles>
@@ -246,4 +247,16 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>java8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <surefire.argline>-Xmx1536m -XX:PermSize=512m -XX:MaxPermSize=512m 
-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled 
-XX:+CMSPermGenSweepingEnabled</surefire.argline>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 9c1888c..f803d74 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -33,6 +33,7 @@
   <properties>
     <suite.name>passing</suite.name>
     <cdi-tck.version>${cdi.tck.20.version}</cdi-tck.version>
+    <tomee.opts/>
   </properties>
 
   <dependencies>
@@ -239,4 +240,17 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>java8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <tomee.opts>-Xmx1536m -XX:PermSize=512m -XX:MaxPermSize=512m 
-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled 
-XX:+CMSPermGenSweepingEnabled</tomee.opts>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/tck/cdi-tomee/src/test/resources/arquillian.xml 
b/tck/cdi-tomee/src/test/resources/arquillian.xml
index 693016d..529858a 100644
--- a/tck/cdi-tomee/src/test/resources/arquillian.xml
+++ b/tck/cdi-tomee/src/test/resources/arquillian.xml
@@ -31,7 +31,7 @@
       <property name="dir">target/tomee</property>
       <property name="appWorkingDir">target/workdir</property>
       <property name="cleanOnStartUp">true</property>
-      <property name="catalina_opts">-Xmx2048m -XX:PermSize=768m 
-XX:MaxPermSize=1536m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled 
-XX:+CMSPermGenSweepingEnabled</property>
+      <property name="catalina_opts">${tomee.opts}</property>
       <property name="properties">
         openejb.scan.webapp.container = true
         openejb.deploymentId.format = {appId}/{ejbJarId}/{ejbName}