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/09/14 20:58:34 UTC
[maven-integration-testing] 01/01: Remove code corresponding to Maven 2.x and JDK 7
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch rm-mvn2
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 894c45dece1e65e9daadda5c7225ea29c00d47b3
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Wed Sep 14 22:58:16 2022 +0200
Remove code corresponding to Maven 2.x and JDK 7
---
...venITmng0294MergeGlobalAndUserSettingsTest.java | 13 +++----------
.../maven/it/AbstractMavenIntegrationTestCase.java | 22 ++++------------------
run-its.sh | 3 ---
3 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index e6850b438..99514b1a7 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -53,16 +53,9 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
verifier.deleteDirectory( "target" );
verifier.addCliOption( "--settings" );
verifier.addCliOption( "user-settings.xml" );
- if ( matchesVersionRange( "[2.1.0-M2,)" ) )
- {
- // dedicated CLI option only available since MNG-3914
- verifier.addCliOption( "--global-settings" );
- verifier.addCliOption( "global-settings.xml" );
- }
- else
- {
- verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
- }
+ verifier.addCliOption( "--global-settings" );
+ verifier.addCliOption( "global-settings.xml" );
+
if ( matchesVersionRange( "(3.2.5,)" ) )
{
verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
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 e1e4df43c..2b30cb462 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
@@ -568,33 +568,19 @@ public abstract class AbstractMavenIntegrationTestCase
String path = settingsFile.getAbsolutePath();
- // dedicated CLI option only available since MNG-3914
- if ( matchesVersionRange( "[2.1.0,)" ) )
+ verifier.addCliOption( "--global-settings" );
+ if ( path.indexOf( ' ' ) < 0 )
{
- verifier.addCliOption( "--global-settings" );
- if ( path.indexOf( ' ' ) < 0 )
- {
- verifier.addCliOption( path );
- }
- else
- {
- verifier.addCliOption( '"' + path + '"' );
- }
+ verifier.addCliOption( path );
}
else
{
- verifier.getSystemProperties().put( "org.apache.maven.global-settings", path );
+ verifier.addCliOption( '"' + path + '"' );
}
}
try
{
- // Java7 TLS protocol
- if ( VersionRange.createFromVersionSpec( "(,1.8.0)" ).containsVersion( getJavaVersion() ) )
- {
- verifier.addCliOption( "-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 c438cbb5b..0a6bf6672 100755
--- a/run-its.sh
+++ b/run-its.sh
@@ -22,9 +22,6 @@
# 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