Repository: maven
Updated Branches:
  refs/heads/MNG-6069 fe6d51884 -> 0cafb4c04


[MNG-6069] Fix handling of -emp and -ep optional argument


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

Branch: refs/heads/MNG-6069
Commit: 04e67fde93959379eddcd8d17a129bd13e8e159b
Parents: fe6d518
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
Authored: Mon Mar 20 15:01:03 2017 +0000
Committer: Stephen Connolly <stephen.alan.conno...@gmail.com>
Committed: Mon Mar 20 15:01:03 2017 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/maven/cli/CLIManager.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/04e67fde/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 20376d9..774dd0d 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,8 +135,8 @@ public class CLIManager
         options.addOption( Option.builder( ALSO_MAKE_DEPENDENTS ).longOpt( 
"also-make-dependents" ).desc( "If project list is specified, also build 
projects that depend on projects on the list" ).build() );
         options.addOption( Option.builder( LOG_FILE ).longOpt( "log-file" 
).hasArg().desc( "Log file where all build output will go" ).build() );
         options.addOption( Option.builder( SHOW_VERSION ).longOpt( 
"show-version" ).desc( "Display version information WITHOUT stopping build" 
).build() );
-        options.addOption( Option.builder( ENCRYPT_MASTER_PASSWORD ).longOpt( 
"encrypt-master-password" ).optionalArg( true ).desc( "Encrypt master security 
password" ).build() );
-        options.addOption( Option.builder( ENCRYPT_PASSWORD ).longOpt( 
"encrypt-password" ).optionalArg( true ).desc( "Encrypt server password" 
).build() );
+        options.addOption( Option.builder( ENCRYPT_MASTER_PASSWORD ).longOpt( 
"encrypt-master-password" ).numberOfArgs( 1 ).argName( "password" 
).optionalArg( true ).desc( "Encrypt master security password" ).build() );
+        options.addOption( Option.builder( ENCRYPT_PASSWORD ).longOpt( 
"encrypt-password" ).numberOfArgs( 1 ).argName( "password" ).optionalArg( true 
).desc( "Encrypt server password" ).build() );
         options.addOption( Option.builder( THREADS ).longOpt( "threads" 
).hasArg().desc( "Thread count, for instance 2.0C where C is core multiplied" 
).build() );
         options.addOption( Option.builder( LEGACY_LOCAL_REPOSITORY ).longOpt( 
"legacy-local-repository" ).desc( "Use Maven 2 Legacy Local Repository 
behaviour, ie no use of _remote.repositories. Can also be activated by using 
-Dmaven.legacyLocalRepo=true" ).build() );
         options.addOption( Option.builder( BUILDER ).longOpt( "builder" 
).hasArg().desc( "The id of the build strategy to use" ).build() );

Reply via email to