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/26 08:25:16 UTC
[maven-surefire] branch TLS1.2 updated (02d4efb -> 1f067c6)
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.
discard 02d4efb surefire-grouper does not require prerequisites
discard 60dd4b8 fixed CheckTestNgListenerReporterIT with org.testng:testng:7.0.0-beta7
discard f47d616 TLS 1.2 passed to maven-invoker-plugin via system property
new 41e589f fixed CheckTestNgListenerReporterIT with org.testng:testng:7.0.0-beta7
new a1f8fe9 surefire-grouper does not require prerequisites
new 1f067c6 TLS 1.2 passed to maven-invoker-plugin via system property
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (02d4efb)
\
N -- N -- N refs/heads/TLS1.2 (1f067c6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-surefire] 01/03: 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 41e589ffda806437e8a62f794c24215f5f236084
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] 02/03: 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 a1f8fe95487b308e0b0d66edbab1f5ba89bc9f6e
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>
[maven-surefire] 03/03: TLS 1.2 passed to maven-invoker-plugin via
system property
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 1f067c6a1dfabc21f4edc28ebcfc30c0dbcf0daf
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 00:16:49 2019 +0200
TLS 1.2 passed to maven-invoker-plugin via system property
---
Jenkinsfile | 9 ++++++---
maven-failsafe-plugin/pom.xml | 6 +++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0abf4ba..4b906d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ properties(
final def oses = ['linux':'ubuntu', 'windows':'Windows']
final def mavens = env.BRANCH_NAME == 'master' ? ['3.6.x', '3.2.x'] : ['3.6.x']
// all non-EOL versions and the first EA
-final def jdks = [13, 12, 11, 8]
+final def jdks = [13, 12, 11, 8, 7]
final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its']
final def goals = ['clean', 'install']
@@ -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 2e85275..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,6 +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>${https.protocols}</https.protocols>
+ <jdk.tls.client.protocols>${https.protocols}</jdk.tls.client.protocols>
</properties>
</configuration>
</execution>
@@ -341,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>