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 10e73f0 fix
10e73f0 is described below
commit 10e73f0065749d31f557957c98beff2a7e5a6558
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Fri Feb 26 10:37:48 2021 +0100
fix
---
Jenkinsfile | 4 ++--
README.md | 6 +++---
maven-failsafe-plugin/pom.xml | 2 +-
maven-surefire-plugin/src/site/apt/developing.apt.vm | 2 +-
pom.xml | 4 ++--
surefire-its/pom.xml | 4 ++--
surefire-its/src/test/resources/java9-full-api/pom.xml | 4 ++--
surefire-its/src/test/resources/toolchains.xml | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 050c048..540040b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -151,7 +151,7 @@ def buildProcess(String stageKey, String jdkName, String
jdkTestName, String mvn
]) {
sh '$JAVA_HOME_IT/bin/java -version'
sh 'echo JAVA_HOME=$JAVA_HOME, JAVA_HOME_IT=$JAVA_HOME_IT,
PATH=$PATH'
- def script = cmd + ['\"-Djdk.home=$JAVA_HOME_IT\"']
+ def script = cmd + ['\"-DjdkHome=$JAVA_HOME_IT\"']
def error = sh(returnStatus: true, script: script.join('
'))
currentBuild.result = error == 0 ? 'SUCCESS' : 'FAILURE'
}
@@ -163,7 +163,7 @@ def buildProcess(String stageKey, String jdkName, String
jdkTestName, String mvn
]) {
bat '%JAVA_HOME_IT%\\bin\\java -version'
bat 'echo JAVA_HOME=%JAVA_HOME%,
JAVA_HOME_IT=%JAVA_HOME_IT%, PATH=%PATH%'
- def script = cmd + ['\"-Djdk.home=%JAVA_HOME_IT%\"']
+ def script = cmd + ['\"-DjdkHome=%JAVA_HOME_IT%\"']
def error = bat(returnStatus: true, script: script.join('
'))
currentBuild.result = error == 0 ? 'SUCCESS' : 'FAILURE'
}
diff --git a/README.md b/README.md
index e9c0fba..7be267a 100644
--- a/README.md
+++ b/README.md
@@ -59,13 +59,13 @@ Build the Surefire project using **Maven 3.1.0+** and **JDK
1.8+**.
set MAVEN_OPTS="-server -Xmx256m -XX:MetaspaceSize=128m
-XX:MaxMetaspaceSize=384m -XX:+UseG1GC -XX:+UseStringDeduplication
-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50
-Djava.awt.headless=true -Dhttps.protocols=TLSv1.2"
```
-* In order to run the tests with **JDK 1.7** (on Linux/Unix modify the system
property **jdk.home**):
+* In order to run the tests with **JDK 1.7** (on Linux/Unix modify the system
property **jdkHome**):
```
- mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program
Files\Java\jdk1.7.0_80\"
+ mvn install site site:stage -P reporting,run-its "-DjdkHome=e:\Program
Files\Java\jdk1.7.0_80\"
```
* In order to run the build and the tests with **JDK 1.8+**, e.g. JDK 11:
```
- mvn install site site:stage -P reporting,run-its "-Djdk.home=e:\Program
Files\Java\jdk11\"
+ mvn install site site:stage -P reporting,run-its "-DjdkHome=e:\Program
Files\Java\jdk11\"
```
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index fcf9677..f9ef2ec 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -291,7 +291,7 @@
</execution>
</executions>
<configuration>
- <javaHome>${jdk.home}</javaHome>
+ <javaHome>${jdkHome}</javaHome>
</configuration>
</plugin>
</plugins>
diff --git a/maven-surefire-plugin/src/site/apt/developing.apt.vm
b/maven-surefire-plugin/src/site/apt/developing.apt.vm
index dcae1d7..7c8ccb2 100644
--- a/maven-surefire-plugin/src/site/apt/developing.apt.vm
+++ b/maven-surefire-plugin/src/site/apt/developing.apt.vm
@@ -119,7 +119,7 @@ ForkedBooter#main
and other modules are compiled with source/target 1.7. The plugin and
several providers are 1.7.
The provider <<<surefire-junit-platform>>> is compiled with jdk1.8.
The project requires using <<<JAVA_HOME>>> jdk1.8 but the tests run with
jdk1.7+ which is
- configured by system property <<<jdk.home>>>, see <<<README.md>>>.
+ configured by system property <<<jdkHome>>>, see <<<README.md>>>.
* Provider Isolation
diff --git a/pom.xml b/pom.xml
index 6782431..3e36523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,7 +514,7 @@
<argLine>${jvm.args.tests}</argLine><!--
-Dnet.bytebuddy.experimental=true ${jacoco.agent}-->
<useFile>false</useFile>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
- <jvm>${jdk.home}/bin/java</jvm>
+ <jvm>${jdkHome}/bin/java</jvm>
</configuration>
</plugin>
<plugin>
@@ -674,7 +674,7 @@
<property>jvm9ArgsTests</property>
</properties>
<source>
- jdkHome =
session.getUserProperties().getProperty("jdk.home",
project.getProperties().getProperty("jdk.home"));
+ jdkHome =
session.getUserProperties().getProperty("jdkHome",
project.getProperties().getProperty("jdkHome"));
if (jdkHome == null || jdkHome.isEmpty()) {
jreHome = System.getProperty("java.home");
jrePath = new File(jreHome);
diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index c674e31..74a5867 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -720,7 +720,7 @@
<version>3.0.0-M4</version> <!-- ${shadedVersion}, but
resolved due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<configuration>
<skipTests>${skipTests}</skipTests>
- <jvm>${jdk.home}/bin/java</jvm>
+ <jvm>${jdkHome}/bin/java</jvm>
<runOrder>alphabetical</runOrder>
<threadCount>1</threadCount>
<perCoreThreadCount>false</perCoreThreadCount>
@@ -738,7 +738,7 @@
<maven.toolchains.file>${project.build.directory}/private/toolchains.xml</maven.toolchains.file>
<maven.test.tmpdir>${project.build.directory}</maven.test.tmpdir>
<verifier.forkMode>forked</verifier.forkMode>
- <jdk.home>${jdk.home}</jdk.home>
+ <jdkHome>${jdkHome}</jdkHome>
<jacoco.agent>${jacoco-it.agent}</jacoco.agent>
<!-- see the f/w
com.googlecode.junit-toolbox:junit-toolbox -->
diff --git a/surefire-its/src/test/resources/java9-full-api/pom.xml
b/surefire-its/src/test/resources/java9-full-api/pom.xml
index c8aa635..d1dfe79 100644
--- a/surefire-its/src/test/resources/java9-full-api/pom.xml
+++ b/surefire-its/src/test/resources/java9-full-api/pom.xml
@@ -96,7 +96,7 @@
<id>use-jvm-config-paramater</id>
<activation>
<property>
- <name>jdk.home</name>
+ <name>jdkHome</name>
</property>
</activation>
<build>
@@ -104,7 +104,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <jvm>${jdk.home}/bin/java</jvm>
+ <jvm>${jdkHome}/bin/java</jvm>
</configuration>
</plugin>
</plugins>
diff --git a/surefire-its/src/test/resources/toolchains.xml
b/surefire-its/src/test/resources/toolchains.xml
index f9f1d66..235c23a 100644
--- a/surefire-its/src/test/resources/toolchains.xml
+++ b/surefire-its/src/test/resources/toolchains.xml
@@ -29,7 +29,7 @@
<vendor>oracle</vendor>
</provides>
<configuration>
- <jdkHome>${jdk.home}</jdkHome>
+ <jdkHome>${jdkHome}</jdkHome>
</configuration>
</toolchain>
</toolchains>
