From f3fa66c29127a994e7a20d7aabc4118c28d643db Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Wed, 14 Sep 2022 22:58:16 +0200
Subject: [PATCH] Remove code corresponding to Maven 2.x and JDK 7

---
 ...mng0294MergeGlobalAndUserSettingsTest.java | 16 ++------------
 ...Tmng6972AllowAccessToGraphPackageTest.java |  2 --
 .../it/AbstractMavenIntegrationTestCase.java  | 22 ++++---------------
 run-its.sh                                    |  3 ---
 4 files changed, 6 insertions(+), 37 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..29ac89be8 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,20 +53,8 @@ public void testitMNG294()
         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" );
-        }
-        if ( matchesVersionRange( "(3.2.5,)" ) )
-        {
-            verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
-        }
+        verifier.addCliOption( "--global-settings" );
+        verifier.addCliOption( "global-settings.xml" );
         verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
index 3b9546614..d457fd9a9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6972AllowAccessToGraphPackageTest.java
@@ -56,13 +56,11 @@ public void testit()
         verifier.deleteArtifact( "mng-6972-allow-access-to-graph-package", "using-module", "1.0", "jar" );
 
         verifier = newVerifier( new File( testDir.getAbsolutePath(), "build-plugin" ).getAbsolutePath() );
-        verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
         verifier.executeGoal( "install" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
         verifier = newVerifier( new File( testDir.getAbsolutePath(), "using-module" ).getAbsolutePath() );
-        verifier.getSystemProperties().put( "maven.multiModuleProjectDirectory", testDir.getAbsolutePath() );
         verifier.executeGoal( "install" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
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 @@ protected Verifier newVerifier( String basedir, String settings, boolean debug )
 
             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