mirror of https://github.com/apache/maven.git
[MNG-553] security dispatcher design changed
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@743901 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b59c6b609b
commit
0217b6f4fa
|
@ -51,7 +51,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
||||||
List cliOptions = new ArrayList();
|
List cliOptions = new ArrayList();
|
||||||
cliOptions.add( "--settings" );
|
cliOptions.add( "--settings" );
|
||||||
cliOptions.add( "settings.xml" );
|
cliOptions.add( "settings.xml" );
|
||||||
verifier.getSystemProperties().setProperty( "maven.sec.path", "settings-security.xml" );
|
verifier.getSystemProperties().setProperty( "settings.security", "settings-security.xml" );
|
||||||
verifier.setCliOptions( cliOptions );
|
verifier.setCliOptions( cliOptions );
|
||||||
verifier.executeGoal( "validate" );
|
verifier.executeGoal( "validate" );
|
||||||
verifier.verifyErrorFreeLog();
|
verifier.verifyErrorFreeLog();
|
||||||
|
@ -85,7 +85,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest
|
||||||
List cliOptions = new ArrayList();
|
List cliOptions = new ArrayList();
|
||||||
cliOptions.add( "--settings" );
|
cliOptions.add( "--settings" );
|
||||||
cliOptions.add( "settings.xml" );
|
cliOptions.add( "settings.xml" );
|
||||||
verifier.getSystemProperties().setProperty( "maven.sec.path", "settings~security.xml" );
|
verifier.getSystemProperties().setProperty( "settings.security", "settings~security.xml" );
|
||||||
verifier.setCliOptions( cliOptions );
|
verifier.setCliOptions( cliOptions );
|
||||||
// NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
|
// NOTE: The selection of the Turkish language for the JVM locale is essential part of the test
|
||||||
verifier.executeGoal( "validate", Collections.singletonMap( "MAVEN_OPTS", "-Duser.language=tr" ) );
|
verifier.executeGoal( "validate", Collections.singletonMap( "MAVEN_OPTS", "-Duser.language=tr" ) );
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<settingsSecurity>
|
<settingsSecurity>
|
||||||
<master>{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}</master>
|
<master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
|
||||||
</settingsSecurity>
|
</settingsSecurity>
|
||||||
|
|
|
@ -24,7 +24,7 @@ under the License.
|
||||||
<server>
|
<server>
|
||||||
<id>test</id>
|
<id>test</id>
|
||||||
<username>testuser</username>
|
<username>testuser</username>
|
||||||
<password>{8+qG0C/CnRsH+45rqY50rWb1cMILU4zu9K/sZ8omYzs=}</password>
|
<password>{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}</password>
|
||||||
</server>
|
</server>
|
||||||
</servers>
|
</servers>
|
||||||
</settings>
|
</settings>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<settingsSecurity>
|
<settingsSecurity>
|
||||||
<master>{jSMOWnoPFgsHVpMvz5VrIt5kRbzGpI8u+9EF1iFQyJQ=}</master>
|
<master>{1wQaa6S/o8MH7FnaTNL53XmhT5O0SEGXQi3gC49o6OY=}</master>
|
||||||
</settingsSecurity>
|
</settingsSecurity>
|
||||||
|
|
|
@ -24,7 +24,7 @@ under the License.
|
||||||
<server>
|
<server>
|
||||||
<id>test</id>
|
<id>test</id>
|
||||||
<username>testuser</username>
|
<username>testuser</username>
|
||||||
<password>{8+qG0C/CnRsH+45rqY50rWb1cMILU4zu9K/sZ8omYzs=}</password>
|
<password>{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}</password>
|
||||||
</server>
|
</server>
|
||||||
</servers>
|
</servers>
|
||||||
</settings>
|
</settings>
|
||||||
|
|
Loading…
Reference in New Issue