Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests on JDK 1.7 - setup TLS protocol for verifier

This commit is contained in:
Slawomir Jaranowski 2022-04-07 21:02:08 +02:00
parent 66cd7b58fb
commit 98af9777d6
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/child/pom.xml
View File

@ -17,7 +17,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version> <version>1.4.1</version>
<executions> <executions>
<execution> <execution>
<inherited>false</inherited> <inherited>false</inherited>

2
its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/child/pom.xml
View File

@ -17,7 +17,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version> <version>1.4.1</version>
<executions> <executions>
<execution> <execution>
<inherited>false</inherited> <inherited>false</inherited>

2
its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/child/pom.xml
View File

@ -17,7 +17,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version> <version>1.4.1</version>
<executions> <executions>
<execution> <execution>
<inherited>false</inherited> <inherited>false</inherited>

6
its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
View File

@ -600,6 +600,12 @@ public abstract class AbstractMavenIntegrationTestCase
try 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 // auto set source+target to lowest reasonable java version
// Java9 requires at least 1.6 // Java9 requires at least 1.6
if ( VersionRange.createFromVersionSpec( "[9,12)" ).containsVersion( getJavaVersion() ) ) if ( VersionRange.createFromVersionSpec( "[9,12)" ).containsVersion( getJavaVersion() ) )

3
its/run-its.sh
View File

@ -22,6 +22,9 @@
# How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ. # How I run the ITs from a clean slate. Though I do this with a primed Nexus instance. JvZ.
# build maven core using -PversionlessMavenDist # 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 mvn clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo
# If behind a proxy try this # If behind a proxy try this