HSEARCH-4124 Remove the (now unnecessary) dichotomy between strict/le…

…nient JVM args Signed-off-by: Yoann Rodière <yoann@hibernate.org>
hibernate · Dec 14, 2020 · b03ec3a · b03ec3a
1 parent 5111ac3
commit b03ec3a
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -428,14 +428,9 @@
         <surefire.jvm.java_home>${java.home}</surefire.jvm.java_home>
         <surefire.jvm.java_executable>${surefire.jvm.java_home}/bin/java</surefire.jvm.java_executable>
         <surefire.jvm.args.memory>-Xmx512m -Xms128m</surefire.jvm.args.memory>
-        <!--
-            Provide two sets of settings for settings specific to a java version.
-            This is mainly useful when running tests in Arquillian, where illegal-access=deny won't work
-            and is not useful, so we disable it.
-         -->
-        <surefire.jvm.args.java-version.strict></surefire.jvm.args.java-version.strict>
-        <surefire.jvm.args.java-version.lenient></surefire.jvm.args.java-version.lenient>
-        <surefire.jvm.args.java-version>${surefire.jvm.args.java-version.strict}</surefire.jvm.args.java-version>
+        <!-- JVM args to be customized depending on the Java version -->
+        <surefire.jvm.args.java-version></surefire.jvm.args.java-version>
+        <!-- JVM args generated by JaCoCo -->
         <surefire.jvm.args.jacoco></surefire.jvm.args.jacoco>
         <failsafe.jvm.args.jacoco></failsafe.jvm.args.jacoco>
         <!-- JVM args to be customized by each Maven module -->
@@ -1809,13 +1804,10 @@
                 </property>
             </activation>
             <properties>
-                <surefire.jvm.args.java-version.lenient>
+                <surefire.jvm.args.java-version>
                     -Djdk.attach.allowAttachSelf=true
-                </surefire.jvm.args.java-version.lenient>
-                <surefire.jvm.args.java-version.strict>
-                    ${surefire.jvm.args.java-version.lenient}
                     --illegal-access=deny
-                </surefire.jvm.args.java-version.strict>
+                </surefire.jvm.args.java-version>
             </properties>
         </profile>
 
@@ -1872,14 +1864,11 @@
                     We need net.bytebuddy.experimental=true
                     to make BytecodeEnhancementIT pass
                  -->
-                <surefire.jvm.args.java-version.lenient>
+                <surefire.jvm.args.java-version>
                     -Djdk.attach.allowAttachSelf=true
                     -Dnet.bytebuddy.experimental=true
-                </surefire.jvm.args.java-version.lenient>
-                <surefire.jvm.args.java-version.strict>
-                    ${surefire.jvm.args.java-version.lenient}
                     --illegal-access=deny
-                </surefire.jvm.args.java-version.strict>
+                </surefire.jvm.args.java-version>
                 <!-- Spring isn't ready for JDK16 yet -->
                 <failsafe.spring.skip>true</failsafe.spring.skip>
             </properties>