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

[INFRA-18812] Revert unnecessary commits after fixing root cause

This commit is contained in:
rfscholte 2019-08-05 18:30:03 +02:00
parent dc7968f8e3
commit 010191c7b4
5 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
its/core-it-suite/pom.xml
View File

@ -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>

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
View File

@ -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" );

2
its/core-it-suite/src/test/resources/mng-0553/test-1/pom.xml
View File

@ -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>

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

@ -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;
}
}

1
its/pom.xml
View File

@ -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>