[maven-surefire] branch jdk-16-17 updated: fix

[tibordigana]

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

tibordigana pushed a commit to branch jdk-16-17
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/jdk-16-17 by this push:
     new 225ed6d  fix
225ed6d is described below

commit 225ed6d2a841b7dabfbaafb74fd6fb3248e8e367
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Wed Feb 17 18:05:11 2021 +0100

    fix
---
 Jenkinsfile | 7 +++----
 pom.xml     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6802b63..b9f2a2f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,13 +68,12 @@ oses.eachWithIndex { osMapping, indexOfOs ->
                         boolean first = indexOfOs == 0 && indexOfMaven == 0 && 
indexOfJdk == 0
                         def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * 
indexOfJdk
                         def allOptions = options + 
['-Djava.awt.headless=true', 
"-Dfailsafe-integration-test-port=${failsafeItPort}", 
"-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
+                        if (jdk >= 9) {
+                            allOptions += ['-P', 'jdk9+']
+                        }
                         if (jdk == 7) {
                             allOptions += '-Dhttps.protocols=TLSv1.2'
                         }
-                        if (jdk >= 9) {
-                            allOptions += '\"-Djvm9.args.tests=--add-opens 
java.base/java.lang=ALL-UNNAMED\"'
-                            allOptions += '\"-Djvm9.args.tests=--add-opens 
java.base/java.math=ALL-UNNAMED\"'
-                        }
                         if (!maven.startsWith('3.2') && 
!maven.startsWith('3.3') && !maven.startsWith('3.5')) {
                             allOptions += '--no-transfer-progress'
                         }
diff --git a/pom.xml b/pom.xml
index 7d4603a..02b97a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -738,7 +738,7 @@
       </activation>
       <properties>
         <jdk.home>${java.home}</jdk.home>
-        <jvm9.args.tests>--add-opens java.base/java.lang=ALL-UNNAMED 
--add-opens java.base/java.math=ALL-UNNAMED</jvm9.args.tests>
+        <jvm9.args.tests>--add-opens java.base/java.lang=ALL-UNNAMED 
--add-opens java.base/java.math=ALL-UNNAMED --add-opens 
java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 
--add-opens java.base/java.text=ALL-UNNAMED --add-opens 
java.base/java.util.regex=ALL-UNNAMED --add-opens 
java.base/java.nio.channels.spi=ALL-UNNAMED --add-opens 
java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED 
--add-opens java.base/java.util.concurrent=ALL-UNNAMED  [...]
       </properties>
     </profile>
       <profile>