You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/04/08 05:59:56 UTC
[maven-integration-testing] branch master updated: Fix tests on JDK 1.7 - setup TLS protocol for verifier
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 80fee6048 Fix tests on JDK 1.7 - setup TLS protocol for verifier
80fee6048 is described below
commit 80fee6048eb29fb66ba496637b785e6b852d70e5
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Thu Apr 7 21:02:08 2022 +0200
Fix tests on JDK 1.7 - setup TLS protocol for verifier
---
.../resources/mng-5840-relative-path-range-negative/child/pom.xml | 2 +-
.../resources/mng-5840-relative-path-range-positive/child/pom.xml | 2 +-
.../resources/mng-5840-relative-path-reactor-matching/child/pom.xml | 2 +-
.../java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java | 6 ++++++
run-its.sh | 3 +++
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/child/pom.xml b/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/child/pom.xml
index 84ed15713..572f334b1 100644
--- a/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/child/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/child/pom.xml
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>1.4.1</version>
<executions>
<execution>
<inherited>false</inherited>
diff --git a/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/child/pom.xml b/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/child/pom.xml
index aac18637c..1e5d1c8dd 100644
--- a/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/child/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/child/pom.xml
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>1.4.1</version>
<executions>
<execution>
<inherited>false</inherited>
diff --git a/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/child/pom.xml b/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/child/pom.xml
index c784641b0..f9e45a17e 100644
--- a/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/child/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/child/pom.xml
@@ -17,7 +17,7 @@
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>1.4.1</version>
<executions>
<execution>
<inherited>false</inherited>
diff --git a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index a30b07b80..672a14ac4 100644
--- a/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -600,6 +600,12 @@ public abstract class AbstractMavenIntegrationTestCase
try
{
+ // Java7 TLS protocol
+ if ( VersionRange.createFromVersionSpec( "(,1.8.0)" ).containsVersion( getJavaVersion() ) )
+ {
+ verifier.getCliOptions().add( "-Dhttps.protocols=TLSv1.2" );
+ }
+
// auto set source+target to lowest reasonable java version
// Java9 requires at least 1.6
if ( VersionRange.createFromVersionSpec( "[9,12)" ).containsVersion( getJavaVersion() ) )
diff --git a/run-its.sh b/run-its.sh
index 0a6bf6672..c438cbb5b 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -22,6 +22,9 @@
# How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ.
# build maven core using -PversionlessMavenDist
+# For Jdk 7 use with -Dhttps.protocols=TLSv1.2
+# mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo -Dhttps.protocols=TLSv1.2
+
mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
# If behind a proxy try this