You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/08/05 16:30:16 UTC
[maven-integration-testing] branch master updated: [INFRA-18812]
Revert unnecessary commits after fixing root cause
This is an automated email from the ASF dual-hosted git repository.
rfscholte 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 b6b593d [INFRA-18812] Revert unnecessary commits after fixing root cause
b6b593d is described below
commit b6b593d2cf52ae5761c848092dd6f45e82f9da95
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Aug 5 18:30:03 2019 +0200
[INFRA-18812] Revert unnecessary commits after fixing root cause
---
core-it-suite/pom.xml | 4 ----
.../MavenITmng0553SettingsAuthzEncryptionTest.java | 2 --
.../src/test/resources/mng-0553/test-1/pom.xml | 2 +-
.../maven/it/AbstractMavenIntegrationTestCase.java | 27 ----------------------
pom.xml | 1 -
5 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index 444b31c..e1c484d 100644
--- a/core-it-suite/pom.xml
+++ b/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/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
index db5e62d..5c0c5ba 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
+++ b/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/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml b/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
index fdf4bd5..477bb1a 100644
--- a/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
+++ b/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/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 102f3e7..7e3c42a 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
@@ -43,11 +43,6 @@ 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.
*/
private static PrintStream out = System.out;
@@ -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/pom.xml b/pom.xml
index 4bb9c7e..cca422b 100644
--- a/pom.xml
+++ b/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>