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 10:28:17 UTC
[maven-surefire] 01/01: [SUREFIRE-1683] Buildfix: TLS 1.2 passed to
maven-invoker-plugin via system property
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 90a49dcd749ee0a2c166d580eaeca2c92f971d63
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Jul 25 00:16:49 2019 +0200
[SUREFIRE-1683] Buildfix: 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>