Author: bentmann
Date: Sat Feb 20 17:59:46 2010
New Revision: 912164
URL: http://svn.apache.org/viewvc?rev=912164&view=rev
Log:
[MNG-4564] Location (and name) for settings-security.xml has changed in Maven 3
o Strengthened IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
(with props)
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/settings-security.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/settings-security.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java?rev=912164&r1=912163&r2=912164&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java
Sat Feb 20 17:59:46 2010
@@ -54,7 +54,7 @@
public MavenITmng0553SettingsAuthzEncryptionTest()
{
- super( "(2.1.0-M1,3.0-alpha-1),[3.0-alpha-3,)" ); // 2.1.0-M2+
+ super( "[2.1.0,3.0-alpha-1),[3.0-alpha-3,)" );
}
public void setUp()
@@ -124,8 +124,7 @@
verifier.deleteArtifacts( "org.apache.maven.its.mng0553" );
verifier.assertArtifactNotPresent( "org.apache.maven.its.mng0553",
"a", "0.1-SNAPSHOT", "jar" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8",
filterProps );
- verifier.getSystemProperties().setProperty( "settings.security",
- new File( testDir, "settings-security.xml" ).getAbsolutePath() );
+ setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
@@ -177,12 +176,13 @@
public void testitEncryption()
throws Exception
{
+ requiresMavenVersion( "[2.1.0,3.0-alpha-1),[3.0-alpha-7,)" );
+
testDir = new File( testDir, "test-3" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.getSystemProperties().setProperty( "settings.security",
- new File( testDir, "settings-security.xml" ).getAbsolutePath() );
+ setUserHome( verifier, new File( testDir, "user.home" ) );
verifier.getCliOptions().add( "--encrypt-master-password" );
verifier.getCliOptions().add( "test" );
verifier.setLogFileName( "log-emp.txt" );
@@ -195,8 +195,7 @@
verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
- verifier.getSystemProperties().setProperty( "settings.security",
- new File( testDir, "settings-security.xml" ).getAbsolutePath() );
+ setUserHome( verifier, new File( testDir, "userhome" ) );
verifier.getCliOptions().add( "--encrypt-password" );
verifier.getCliOptions().add( "testpass" );
verifier.setLogFileName( "log-ep.txt" );
@@ -223,4 +222,11 @@
return null;
}
+ private void setUserHome( Verifier verifier, File home )
+ {
+ // NOTE: We set the user.home directory instead of say
settings.security to reflect Maven's normal behavior
+ String path = home.getAbsolutePath();
+ verifier.setEnvironmentVariable( "MAVEN_OPTS", "\"-Duser.home=" + path
+ "\"" );
+ }
+
}
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml?rev=912164&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
Sat Feb 20 17:59:46 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settingsSecurity>
+ <master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
+</settingsSecurity>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-1/userhome/.m2/settings-security.xml
------------------------------------------------------------------------------
svn:mergeinfo =
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml?rev=912164&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
Sat Feb 20 17:59:46 2010
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settingsSecurity>
+ <master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
+</settingsSecurity>
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-0553/test-3/userhome/.m2/settings-security.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
