Updated Branches:
  refs/heads/master 82eba2a03 -> b83de53e8

[MNG-5500] tracking file is now _remote.repositories (was
_maven.repositories in Maven 3.0.x)

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b83de53e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b83de53e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b83de53e

Branch: refs/heads/master
Commit: b83de53e860d1fd9c110d82d50925a20ac7fd945
Parents: 82eba2a
Author: Hervé Boutemy <hbout...@apache.org>
Authored: Sun Jul 28 18:35:31 2013 +0200
Committer: Hervé Boutemy <hbout...@apache.org>
Committed: Sun Jul 28 18:35:31 2013 +0200

----------------------------------------------------------------------
 maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/b83de53e/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java 
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 5ca56d8..dfa317b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -135,7 +135,7 @@ public class CLIManager
         options.addOption( OptionBuilder.withLongOpt( 
"encrypt-master-password" ).hasArg().withDescription( "Encrypt master security 
password" ).create( ENCRYPT_MASTER_PASSWORD ) );
         options.addOption( OptionBuilder.withLongOpt( "encrypt-password" 
).hasArg().withDescription( "Encrypt server password" ).create( 
ENCRYPT_PASSWORD ) );
         options.addOption( OptionBuilder.withLongOpt( "threads" 
).hasArg().withDescription( "Thread count, for instance 2.0C where C is core 
multiplied" ).create( THREADS ) );
-        options.addOption( OptionBuilder.withLongOpt( 
"legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local 
Repository behaviour, ie no use of _maven.repositories. Can also be activated 
by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
+        options.addOption( OptionBuilder.withLongOpt( 
"legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local 
Repository behaviour, ie no use of _remote.repositories. Can also be activated 
by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
 
         // Adding this back in for compatibility with the verifier that hard 
codes this option.
         options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" 
).withDescription( "Ineffective, only kept for backward compatibility" 
).create( "npr" ) );

Reply via email to