You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/25 19:05:27 UTC
[maven-surefire] branch TLS1.2 updated (d5cfd18 -> 9911604)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch TLS1.2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
from d5cfd18 jdk 7
new 4cb83d1 "https.protocols" controlled from outside
new a5a8ba9 fixed CheckTestNgListenerReporterIT with org.testng:testng:7.0.0-beta7
new 32be53e surefire-grouper does not require prerequisites
new 9911604 [SUREFIRE-1678] JUnit5 Integration Tests should test wide spectrum of versions
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 7 +++++--
maven-failsafe-plugin/pom.xml | 7 +++++--
surefire-grouper/pom.xml | 4 ----
.../apache/maven/surefire/its/CheckTestNgListenerReporterIT.java | 2 +-
.../java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 1 +
.../test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java | 1 +
6 files changed, 13 insertions(+), 9 deletions(-)
[maven-surefire] 02/04: fixed CheckTestNgListenerReporterIT with
org.testng:testng:7.0.0-beta7
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch TLS1.2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit a5a8ba98954745be9f505080eb6e41ddc8a6ca0c
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 19:32:39 2019 +0200
fixed CheckTestNgListenerReporterIT with org.testng:testng:7.0.0-beta7
---
.../org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
index 5c73a28..0db9e43 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
@@ -72,7 +72,7 @@ public class CheckTestNgListenerReporterIT
{ "5.14.9", null, 1.5d }, // Latest 5.14.x TestNG version
{ "6.0", null, 1.5d },
{ "6.14.3", null, 1.7d },
- { "7.0.0-beta7", null, 1.7d } // Currently latest TestNG version
+ { "7.0.0-beta7", null, 1.8d } // Currently latest TestNG version
});
}
[maven-surefire] 01/04: "https.protocols" controlled from outside
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch TLS1.2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 4cb83d1927e6cc2608cd9b9f1d3c90d13d0280d6
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 19:31:11 2019 +0200
"https.protocols" controlled from outside
---
Jenkinsfile | 7 +++++--
maven-failsafe-plugin/pom.xml | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 53ea768..37ba8e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,7 +52,7 @@ oses.eachWithIndex { osMapping, indexOfOs ->
// Referenses for TLS:
// https://central.sonatype.org/articles/2018/May/04/discontinued-support-for-tlsv11-and-below/?__hstc=31049440.ab2fd229e7f8b6176196d9f78621e1f5.1534324377408.1534324377408.1534324377408.1&__hssc=31049440.1.1534324377409&__hsfp=2729160845
- def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseNUMA -Xms64m -Djava.awt.headless=true -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2'
+ def mavenOpts = '-server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+UseNUMA -Xms64m'
mavenOpts += (os == 'linux' ? ' -Xmx1g' : ' -Xmx256m')
if (label == null || jdkTestName == null || mvnName == null) {
@@ -67,7 +67,10 @@ oses.eachWithIndex { osMapping, indexOfOs ->
timestamps {
boolean first = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
- def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
+ def allOptions = options + ['-Djava.awt.headless=true', "-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
+ if (jdk == 7) {
+ allOptions += ['-Dhttps.protocols=TLSv1.2']
+ }
ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : pwd()}") {
buildProcess(stageKey, jdkName, jdkTestName, mvnName, first ? goalsDepl : goals, allOptions, mavenOpts, first)
}
diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml
index 2bc4a14..e9412f2 100644
--- a/maven-failsafe-plugin/pom.xml
+++ b/maven-failsafe-plugin/pom.xml
@@ -290,6 +290,9 @@
</profile>
<profile>
<id>run-its</id>
+ <properties>
+ <https.protocols>TLSv1.2</https.protocols>
+ </properties>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
@@ -334,7 +337,8 @@
<properties>
<integration-test-port>${failsafe-integration-test-port}</integration-test-port>
<integration-test-stop-port>${failsafe-integration-test-stop-port}</integration-test-stop-port>
- <https.protocols>TLSv1.2</https.protocols>
+ <https.protocols>${https.protocols}</https.protocols>
+ <jdk.tls.client.protocols>${https.protocols}</jdk.tls.client.protocols>
</properties>
</configuration>
</execution>
@@ -342,7 +346,6 @@
<configuration>
<javaHome>${jdk.home}</javaHome>
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <mavenOpts>-Dhttps.protocols=TLSv1.2 -Djdk.tls.client.protocols=TLSv1.2</mavenOpts>
</configuration>
</plugin>
</plugins>
[maven-surefire] 04/04: [SUREFIRE-1678] JUnit5 Integration Tests
should test wide spectrum of versions
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch TLS1.2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 99116040ba916e1bffbf1dbf3c6809570859b256
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 21:05:07 2019 +0200
[SUREFIRE-1678] JUnit5 Integration Tests should test wide spectrum of versions
---
.../test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java | 1 +
.../src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
index fe49ba7..69f403a 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
@@ -67,6 +67,7 @@ public class JUnitPlatformEnginesIT
args.add( new Object[] { "1.4.2", "5.4.2", "1.1.1", "1.0.0" } );
args.add( new Object[] { "1.5.0-RC1", "5.5.0-RC1", "1.2.0", "1.1.0" } );
args.add( new Object[] { "1.5.0", "5.5.0", "1.2.0", "1.1.0" } );
+ args.add( new Object[] { "1.5.1", "5.5.1", "1.2.0", "1.1.0" } );
args.add( new Object[] { "1.6.0-SNAPSHOT", "5.6.0-SNAPSHOT", "1.2.0", "1.1.0" } );
return args;
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 2cf431a..266a29b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -58,6 +58,7 @@ public class JUnitPlatformIT
args.add( new Object[] { "5.4.0", "0.9.3" } );
args.add( new Object[] { "5.4.2", "1.0.0" } );
args.add( new Object[] { "5.5.0", "1.1.0" } );
+ args.add( new Object[] { "5.5.1", "1.1.0" } );
args.add( new Object[] { "5.6.0-SNAPSHOT", "1.1.6" } );
return args;
}
[maven-surefire] 03/04: surefire-grouper does not require
prerequisites
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch TLS1.2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 32be53e2c8f7e8c272eb60336b98f9415a6daa17
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 21:03:08 2019 +0200
surefire-grouper does not require prerequisites
---
surefire-grouper/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/surefire-grouper/pom.xml b/surefire-grouper/pom.xml
index 96c7bc4..2e92e60 100644
--- a/surefire-grouper/pom.xml
+++ b/surefire-grouper/pom.xml
@@ -32,10 +32,6 @@
<name>Maven Surefire Test-Grouping Support</name>
<description>Maven Surefire Test-Grouping Support</description>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
<build>
<plugins>
<plugin>