Updated Branches: refs/heads/master 6c3ec90f2 -> 8ada7e763
[MNG-5185] [MNG-5181] can be activated using -Dmaven.simpleLocalRepoMan=true (for add in MAVEN_OPTS) Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8ada7e76 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8ada7e76 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8ada7e76 Branch: refs/heads/master Commit: 8ada7e763b9d2333c34d397ae64294cd0f5b0128 Parents: 27f8b0f Author: olivier lamy <ol...@apache.org> Authored: Fri Feb 1 00:41:44 2013 +0100 Committer: olivier lamy <ol...@apache.org> Committed: Fri Feb 1 00:41:44 2013 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/maven/cli/CLIManager.java | 4 +++- .../main/java/org/apache/maven/cli/MavenCli.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8ada7e76/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 32c1bb2..44eb7a3 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 @@ -136,7 +136,9 @@ public class CLIManager 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( "simple-local-repository-manager" ).withDescription( "Use a simple local Repository Manager (no use of _maven.repositories)" ).create( SIMPLE_LOCAL_REPOSITORY_MANAGER ) ); + options.addOption( OptionBuilder.withLongOpt( "simple-local-repository-manager" ).withDescription( + "Use a simple local Repository Manager (no use of _maven.repositories) can be activated using -Dmaven.simpleLocalRepoMan=true" ).create( + SIMPLE_LOCAL_REPOSITORY_MANAGER ) ); // 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" ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/8ada7e76/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index dd42ba6..a6ce497 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -542,7 +542,7 @@ public class MavenCli private void repository( CliRequest cliRequest ) throws Exception { - if ( cliRequest.commandLine.hasOption( CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER ) ) + if ( cliRequest.commandLine.hasOption( CLIManager.SIMPLE_LOCAL_REPOSITORY_MANAGER ) || Boolean.getBoolean( "maven.simpleLocalRepoMan" ) ) { cliRequest.request.setUseSimpleLocalRepostoryManager( true ); }
