This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch fix/MNG-6069 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 4c42933cab90216b5417f95478b28e95db09c189 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Sat Mar 18 18:18:27 2017 +0100 [MNG-6069] Migrate to non deprecated parts of Commons CLI --- .../main/java/org/apache/maven/cli/CLIManager.java | 4 +- .../main/java/org/apache/maven/cli/MavenCli.java | 49 +++++----------------- 2 files changed, 13 insertions(+), 40 deletions(-) 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..0746b71 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" ).hasArg().optionalArg( true ).desc( "Encrypt master security password" ).build() ); + options.addOption( Option.builder( ENCRYPT_PASSWORD ).longOpt( "encrypt-password" ).hasArg().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() ); 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 6a1a34a..bd4f80f 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 @@ -1650,14 +1650,18 @@ public class MavenCli if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) ) { - String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY ); - - if ( defStrs != null ) + Properties lineOptionProperties = commandLine.getOptionProperties( CLIManager.SET_SYSTEM_PROPERTY ); + + for ( String defStr : lineOptionProperties.stringPropertyNames( ) ) { - for ( String defStr : defStrs ) - { - setCliProperty( defStr, userProperties ); - } + String optValue = lineOptionProperties.getProperty( defStr ); + userProperties.setProperty( defStr, optValue ); + + // ---------------------------------------------------------------------- + // I'm leaving the setting of system properties here as not to break + // the SystemPropertyProfileActivator. This won't harm embedding. jvz. + // ---------------------------------------------------------------------- + System.setProperty( defStr, optValue ); } } @@ -1677,37 +1681,6 @@ public class MavenCli systemProperties.setProperty( "maven.build.version", mavenBuildVersion ); } - private static void setCliProperty( String property, Properties properties ) - { - String name; - - String value; - - int i = property.indexOf( '=' ); - - if ( i <= 0 ) - { - name = property.trim(); - - value = "true"; - } - else - { - name = property.substring( 0, i ).trim(); - - value = property.substring( i + 1 ); - } - - properties.setProperty( name, value ); - - // ---------------------------------------------------------------------- - // I'm leaving the setting of system properties here as not to break - // the SystemPropertyProfileActivator. This won't harm embedding. jvz. - // ---------------------------------------------------------------------- - - System.setProperty( name, value ); - } - static class ExitException extends Exception {
