Author: brett
Date: Fri Feb 20 11:36:05 2009
New Revision: 746212
URL: http://svn.apache.org/viewvc?rev=746212&view=rev
Log:
[MNG-553] misunderstood how maven-settings had been configured - we don't
support expressions in components.xml and this was being filtered by the
builder. Revert to using ~ to mark the home directory.
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=746212&r1=746211&r2=746212&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Fri Feb 20 11:36:05 2009
@@ -227,9 +227,12 @@
String passwd = commandLine.getOptionValue(
CLIManager.ENCRYPT_PASSWORD );
dispatcher = (DefaultSecDispatcher) embedder.lookup(
SecDispatcher.ROLE );
- String file =
- System.getProperty(
DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION,
- dispatcher.getConfigurationFile() );
+ String configurationFile = dispatcher.getConfigurationFile();
+ if ( configurationFile.startsWith( "~" ) )
+ {
+ configurationFile = System.getProperty( "user.home" ) +
configurationFile.substring( 1 );
+ }
+ String file = System.getProperty(
DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION, configurationFile );
embedder.release( dispatcher );
String master = null;
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=746212&r1=746211&r2=746212&view=diff
==============================================================================
---
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Fri Feb 20 11:36:05 2009
@@ -616,7 +616,7 @@
</requirement>
</requirements>
<configuration>
-
<_configuration-file>${user.home}/.m2/settings-security.xml</_configuration-file>
+ <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
</configuration>
</component>
</components>
