From 010191c7b46cd104012abceffa17118d3f156c44 Mon Sep 17 00:00:00 2001
From: rfscholte <rfscholte@apache.org>
Date: Mon, 5 Aug 2019 18:30:03 +0200
Subject: [PATCH] [INFRA-18812] Revert unnecessary commits after fixing root
 cause

---
 its/core-it-suite/pom.xml                     |  4 ---
 ...nITmng0553SettingsAuthzEncryptionTest.java |  2 --
 .../test/resources/mng-0553/test-1/pom.xml    |  2 +-
 .../it/AbstractMavenIntegrationTestCase.java  | 27 -------------------
 its/pom.xml                                   |  1 -
 5 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml
index 444b31c753..e1c484d149 100644
--- a/its/core-it-suite/pom.xml
+++ b/its/core-it-suite/pom.xml
@@ -193,10 +193,6 @@ under the License.
               <name>maven.it.global-settings.dir</name>
               <value>${project.build.testOutputDirectory}</value>
             </property>
-            <property>
-              <name>maven.skip.rc</name>
-              <value>${maven.skip.rc}</value>
-            </property>
           </systemProperties>
         </configuration>
       </plugin>
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index db5e62d8a2..5c0c5ba0b6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
@@ -124,7 +124,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
         verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553", "a", "0.1-SNAPSHOT", "jar" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
         setUserHome( verifier, new File( testDir, "userhome" ) );
-        verifier.addCliOption( "--show-version" );
         verifier.addCliOption( "--settings" );
         verifier.addCliOption( "settings.xml" );
         verifier.executeGoal( "validate" );
@@ -196,7 +195,6 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
         verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         setUserHome( verifier, new File( testDir, "userhome" ) );
-        verifier.addCliOption( "--show-version" );
         verifier.addCliOption( "--encrypt-password" );
         verifier.addCliOption( "testpass" );
         verifier.setLogFileName( "log-ep.txt" );
diff --git a/its/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
index fdf4bd5a69..477bb1a31f 100644
--- a/its/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
@@ -28,7 +28,7 @@ under the License.
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Maven Integration Test :: MNG-533 ${user.home}</name>
+  <name>Maven Integration Test :: MNG-533</name>
   <description>
     Test that the auth infos given in the settings.xml are properly decrypted.
   </description>
diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index 102f3e7585..7e3c42a071 100644
--- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -42,11 +42,6 @@ import java.util.regex.Pattern;
 public abstract class AbstractMavenIntegrationTestCase
     extends TestCase
 {
-    /**
-     * Skips using ".mavenrc" on the system. For more information, see 'MAVEN_SKIP_RC' in $MAVEN_DIST/bin/mvn.
-     */
-    private static final boolean MAVEN_SKIP_RC = isMavenSkipRc();
-
     /**
      * Save System.out for progress reports etc.
      */
@@ -500,11 +495,6 @@ public abstract class AbstractMavenIntegrationTestCase
     {
         Verifier verifier = new Verifier( basedir, debug );
 
-        if ( MAVEN_SKIP_RC )
-        {
-            verifier.setEnvironmentVariable( "MAVEN_SKIP_RC", "1" );
-        }
-
         verifier.setAutoclean( false );
 
         if ( settings != null )
@@ -611,21 +601,4 @@ public abstract class AbstractMavenIntegrationTestCase
     {
         assertCanonicalFileEquals( null, new File( expected ), new File( actual ) );
     }
-
-    private static boolean isMavenSkipRc()
-    {
-        boolean skipRc = Boolean.getBoolean( "maven.skip.rc" );
-
-        if ( skipRc )
-        {
-            System.out.println( "SKIPPED - Skipped '.mavenrc'!" );
-        }
-        else
-        {
-            System.out.println( "In order to disable '.mavenrc' set the system property 'maven.skip.rc', i.e. "
-                    + "'mvn -Dmaven.skip.rc=true -P run-its verify'." );
-        }
-
-        return skipRc;
-    }
 }
diff --git a/its/pom.xml b/its/pom.xml
index 4bb9c7eb05..cca422b548 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -136,7 +136,6 @@ under the License.
           <configuration>
             <environmentVariables>
               <JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
-              <JAVA_TOOL_OPTIONS></JAVA_TOOL_OPTIONS>
             </environmentVariables>
           </configuration>
         </plugin>