You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/08/28 18:02:14 UTC

[maven] branch MNG-6069 updated (79e32db -> f44a585)

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch MNG-6069
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard 79e32db  [MNG-6069] Migrate to non deprecated parts of Commons CLI
     add fef1462  [MNG-6362] - Adding CONTRIBUTING, README.md pull_request_template for GitHub.
     add 0dbdda8  Add .factorypath from m2e to .gitignore
     add ef41c0e  updated model version to latest 1.1.0
     add 9c118d3  [MNG-6363] - Remove secret thread configuration property from code
     add 97e8a2b  because it is so more convenient to have this quick guide here when you are using a console to build maven and do not want to open some web link
     add 5beb347  Fix missing/improper use of @link
     add 8e0efaa  [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986)
     add 9abfc88  [MNG-5756] Java home output in mvn -v is misleading
     add 14365ba  [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time
     add 9021d66  Move ArtifactUtilsTest and friends from maven-compat to maven-artifact
     add 3c3a590  [MNG-6382][MNG-6372] upgraded Jansi to 1.17.1
     add 454a4e7  [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid
     add 39fdaad  added "Run ITs" prefix to IT stage names
     add 864d180  [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor
     add 7fde626  simplified Jenkinsfile: avoid copy/paste
     add 6cb5db1  magnify a bit this line :-)
     add f1ed22d  Build core with JDK8 due to 'Received fatal alert: protocol_version' when downloading https://www.apache.org/licenses/LICENSE-2.0.txt
     add 5f8ee6d  [MNG-6423] Upgrade to Wagon 3.1.0
     add 3af07f8  [MNG-6364] run Core ITs also with Java 9
     add 29e9b50  [MNG-6344] Upgrade Guice to 4.2.0
     add 5b4e173  [MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM
     add 1edded0  [maven-release-plugin] prepare release maven-3.5.4
     add 1efd571  [maven-release-plugin] prepare for next development iteration
     add bf0bd63  Master is now on 3.6.0-SNAPSHOT
     add 5f526ab  [INFRA-16467] move components documentation out of CMS space
     add a2b800d  update doap
     add 3d3c068  [MNG-6424] - Upgrade plexus-interpolation to 1.25
     add 5514aa7  Set https.protocols when running with JDK 7
     add a97b03a  Set https.protocols when running with JDK 7
     add 0e1cc11  Set https.protocols when running with JDK 7
     add 870d696  Set https.protocols when running with JDK 7
     add 6f41a82  reorganised dependency graph: group consumer vs build modules
     add 72dca39  Replace org.apache.commons.lang3.Validate#notNull with java.util.Objects#requireNonNull
     add 768e01c  [MNGSITE-339] Broken link: Mailing lists
     add 2ac9c4a  minor grammar fixes
     add e56fe97  [MNG-6449] - Upgrade parent to 32
     add 396f49d  [MGN-6383] - ProjectBuilder unnecessarily rebuilds modules with ci-friendly versions  o Thanks to Christoph Kunze for offering the fix.
     add f567471  improved documentation
     add 1f83d50  fixed typo + little javadoc improvements
     add d0f1efa  fixed dependency schema: model-builder depends on artifact
     add f87ba98  [MNG-6467] - Remove plugin definition from pom file which is inherited
     new f44a585  [MNG-6069] Migrate to non deprecated parts of Commons CLI

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (79e32db)
            \
             N -- N -- N   refs/heads/MNG-6069 (f44a585)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/pull_request_template.md                   |  30 +++++
 CONTRIBUTING.md                                    |  92 ++++++++++++++
 Jenkinsfile                                        | 137 ++++++++-------------
 README.md                                          |  93 ++++++++++++--
 apache-maven/pom.xml                               |   7 +-
 doap_Maven.rdf                                     |  15 ++-
 maven-artifact/pom.xml                             |   2 +-
 .../java/org/apache/maven/artifact/Artifact.java   |   2 +-
 .../maven/artifact/handler/ArtifactHandler.java    |  16 +++
 .../apache/maven/artifact/ArtifactUtilsTest.java   |   2 +
 .../apache/maven/artifact/DefaultArtifactTest.java |   0
 .../artifact/handler/ArtifactHandlerMock.java      |   0
 maven-builder-support/pom.xml                      |   9 +-
 .../java/org/apache/maven/building/FileSource.java |   5 +-
 .../java/org/apache/maven/building/UrlSource.java  |   5 +-
 maven-compat/pom.xml                               |   2 +-
 .../AbstractStringBasedModelInterpolator.java      |   2 +-
 maven-core/pom.xml                                 |   2 +-
 .../repository/LegacyLocalRepositoryManager.java   |   4 +-
 .../metadata/io/DefaultMetadataReader.java         |   8 +-
 .../maven/classrealm/DefaultClassRealmManager.java |   8 +-
 .../internal/DefaultBeanConfigurator.java          |   6 +-
 .../org/apache/maven/execution/BuildSummary.java   |   5 +-
 .../execution/DefaultMavenExecutionRequest.java    |  10 +-
 .../apache/maven/graph/DefaultGraphBuilder.java    |  19 ++-
 .../maven/graph/DefaultProjectDependencyGraph.java |   6 +-
 .../graph/FilteredProjectDependencyGraph.java      |   4 +-
 .../maven/plugin/DefaultExtensionRealmCache.java   |   4 +-
 .../maven/plugin/DefaultPluginArtifactsCache.java  |   5 +-
 .../maven/plugin/DefaultPluginRealmCache.java      |   5 +-
 .../plugin/internal/DefaultMavenPluginManager.java |   9 +-
 .../project/DefaultModelBuildingListener.java      |   9 +-
 .../project/DefaultProjectBuildingRequest.java     |   4 +-
 .../maven/project/DefaultProjectRealmCache.java    |   4 +-
 .../org/apache/maven/project/MavenProject.java     |   6 +-
 .../artifact/DefaultProjectArtifactsCache.java     |   5 +-
 .../toolchain/io/DefaultToolchainsReader.java      |   8 +-
 maven-core/src/site/apt/artifact-handlers.apt      |  13 +-
 maven-core/src/site/apt/index.apt                  |   2 +-
 .../apache/maven/project/PomConstructionTest.java  |  81 ++++++------
 .../maven/project/harness/PomTestWrapper.java      |   6 +-
 .../pom.xml                                        |   0
 maven-embedder/pom.xml                             |   2 +-
 .../org/apache/maven/cli/CLIReportingUtils.java    |   7 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |  38 +++++-
 .../maven/cli/event/ExecutionEventLogger.java      |   4 +-
 maven-model-builder/pom.xml                        |   6 +-
 .../maven/model/building/DefaultModelBuilder.java  |  17 ++-
 .../model/building/DefaultModelBuildingResult.java |   8 +-
 .../building/ModelProblemCollectorRequest.java     |   7 +-
 .../AbstractStringBasedModelInterpolator.java      |   4 +-
 .../apache/maven/model/io/DefaultModelReader.java  |   8 +-
 .../apache/maven/model/io/DefaultModelWriter.java  |  14 +--
 .../resources/org/apache/maven/model/pom-4.0.0.xml |   2 +-
 .../activation/AbstractProfileActivatorTest.java   |   5 +-
 maven-model/pom.xml                                |   6 +-
 .../org/apache/maven/model/merge/ModelMerger.java  |   4 +-
 maven-plugin-api/pom.xml                           |   2 +-
 maven-repository-metadata/pom.xml                  |   2 +-
 maven-resolver-provider/pom.xml                    |   6 +-
 .../internal/DefaultArtifactDescriptorReader.java  |  15 +--
 .../internal/DefaultVersionRangeResolver.java      |   8 +-
 .../internal/DefaultVersionResolver.java           |   8 +-
 .../repository/internal/RelocatedArtifact.java     |   4 +-
 maven-settings-builder/pom.xml                     |   6 +-
 .../maven/settings/io/DefaultSettingsReader.java   |   8 +-
 .../maven/settings/io/DefaultSettingsWriter.java   |  14 +--
 maven-settings/pom.xml                             |   2 +-
 maven-settings/src/main/mdo/settings.mdo           |   4 -
 maven-settings/src/site/apt/index.apt              |   2 +-
 maven-slf4j-provider/pom.xml                       |   2 +-
 pom.xml                                            |  14 +--
 src/site/resources/images/maven-deps.png           | Bin 69010 -> 104566 bytes
 src/site/xdoc/index.xml                            |  58 ++++-----
 src/site/xdoc/maven-deps.odg                       | Bin 18600 -> 19887 bytes
 75 files changed, 580 insertions(+), 359 deletions(-)
 create mode 100644 .github/pull_request_template.md
 create mode 100644 CONTRIBUTING.md
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (93%)
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%)
 rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%)
 rename maven-core/src/test/resources-project-builder/{baseurl-interpolation => baseuri-interpolation}/pom.xml (100%)


[maven] 01/01: [MNG-6069] Migrate to non deprecated parts of Commons CLI

Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MNG-6069
in repository https://gitbox.apache.org/repos/asf/maven.git

commit f44a585be9a0d17ab3ada51a2778ad21302af09e
Author: Karl Heinz Marbaise <kh...@apache.org>
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 | 118 +++++++++++----------
 1 file changed, 60 insertions(+), 58 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 a9038bf..20376d9 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
@@ -24,9 +24,9 @@ import java.io.PrintWriter;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
@@ -35,43 +35,43 @@ import org.apache.commons.cli.ParseException;
  */
 public class CLIManager
 {
-    public static final char ALTERNATE_POM_FILE = 'f';
+    public static final String ALTERNATE_POM_FILE = "f";
 
-    public static final char BATCH_MODE = 'B';
+    public static final String BATCH_MODE = "B";
 
-    public static final char SET_SYSTEM_PROPERTY = 'D';
+    public static final String SET_SYSTEM_PROPERTY = "D";
 
-    public static final char OFFLINE = 'o';
+    public static final String OFFLINE = "o";
 
-    public static final char QUIET = 'q';
+    public static final String QUIET = "q";
 
-    public static final char DEBUG = 'X';
+    public static final String DEBUG = "X";
 
-    public static final char ERRORS = 'e';
+    public static final String ERRORS = "e";
 
-    public static final char HELP = 'h';
+    public static final String HELP = "h";
 
-    public static final char VERSION = 'v';
+    public static final String VERSION = "v";
 
-    public static final char SHOW_VERSION = 'V';
+    public static final String SHOW_VERSION = "V";
 
-    public static final char NON_RECURSIVE = 'N';
+    public static final String NON_RECURSIVE = "N";
 
-    public static final char UPDATE_SNAPSHOTS = 'U';
+    public static final String UPDATE_SNAPSHOTS = "U";
 
-    public static final char ACTIVATE_PROFILES = 'P';
+    public static final String ACTIVATE_PROFILES = "P";
 
     public static final String SUPRESS_SNAPSHOT_UPDATES = "nsu";
 
-    public static final char CHECKSUM_FAILURE_POLICY = 'C';
+    public static final String CHECKSUM_FAILURE_POLICY = "C";
 
-    public static final char CHECKSUM_WARNING_POLICY = 'c';
+    public static final String CHECKSUM_WARNING_POLICY = "c";
 
-    public static final char ALTERNATE_USER_SETTINGS = 's';
+    public static final String ALTERNATE_USER_SETTINGS = "s";
 
     public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
 
-    public static final char ALTERNATE_USER_TOOLCHAINS = 't';
+    public static final String ALTERNATE_USER_TOOLCHAINS = "t";
 
     public static final String ALTERNATE_GLOBAL_TOOLCHAINS = "gt";
 
@@ -103,50 +103,52 @@ public class CLIManager
 
     protected Options options;
 
-    @SuppressWarnings( { "static-access", "checkstyle:linelength" } )
+    // CHECKSTYLE_OFF: LineLength
     public CLIManager()
     {
         options = new Options();
-        options.addOption( OptionBuilder.withLongOpt( "help" ).withDescription( "Display help information" ).create( HELP ) );
-        options.addOption( OptionBuilder.withLongOpt( "file" ).hasArg().withDescription( "Force the use of an alternate POM file (or directory with pom.xml)" ).create( ALTERNATE_POM_FILE ) );
-        options.addOption( OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create( SET_SYSTEM_PROPERTY ) );
-        options.addOption( OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) );
-        options.addOption( OptionBuilder.withLongOpt( "version" ).withDescription( "Display version information" ).create( VERSION ) );
-        options.addOption( OptionBuilder.withLongOpt( "quiet" ).withDescription( "Quiet output - only show errors" ).create( QUIET ) );
-        options.addOption( OptionBuilder.withLongOpt( "debug" ).withDescription( "Produce execution debug output" ).create( DEBUG ) );
-        options.addOption( OptionBuilder.withLongOpt( "errors" ).withDescription( "Produce execution error messages" ).create( ERRORS ) );
-        options.addOption( OptionBuilder.withLongOpt( "non-recursive" ).withDescription( "Do not recurse into sub-projects" ).create( NON_RECURSIVE ) );
-        options.addOption( OptionBuilder.withLongOpt( "update-snapshots" ).withDescription( "Forces a check for missing releases and updated snapshots on remote repositories" ).create( UPDATE_SNAPSHOTS ) );
-        options.addOption( OptionBuilder.withLongOpt( "activate-profiles" ).withDescription( "Comma-delimited list of profiles to activate" ).hasArg().create( ACTIVATE_PROFILES ) );
-        options.addOption( OptionBuilder.withLongOpt( "batch-mode" ).withDescription( "Run in non-interactive (batch) mode (disables output color)" ).create( BATCH_MODE ) );
-        options.addOption( OptionBuilder.withLongOpt( "no-snapshot-updates" ).withDescription( "Suppress SNAPSHOT updates" ).create( SUPRESS_SNAPSHOT_UPDATES ) );
-        options.addOption( OptionBuilder.withLongOpt( "strict-checksums" ).withDescription( "Fail the build if checksums don't match" ).create( CHECKSUM_FAILURE_POLICY ) );
-        options.addOption( OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create( CHECKSUM_WARNING_POLICY ) );
-        options.addOption( OptionBuilder.withLongOpt( "settings" ).withDescription( "Alternate path for the user settings file" ).hasArg().create( ALTERNATE_USER_SETTINGS ) );
-        options.addOption( OptionBuilder.withLongOpt( "global-settings" ).withDescription( "Alternate path for the global settings file" ).hasArg().create( ALTERNATE_GLOBAL_SETTINGS ) );
-        options.addOption( OptionBuilder.withLongOpt( "toolchains" ).withDescription( "Alternate path for the user toolchains file" ).hasArg().create( ALTERNATE_USER_TOOLCHAINS ) );
-        options.addOption( OptionBuilder.withLongOpt( "global-toolchains" ).withDescription( "Alternate path for the global toolchains file" ).hasArg().create( ALTERNATE_GLOBAL_TOOLCHAINS ) );
-        options.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription( "Stop at first failure in reactorized builds" ).create( FAIL_FAST ) );
-        options.addOption( OptionBuilder.withLongOpt( "fail-at-end" ).withDescription( "Only fail the build afterwards; allow all non-impacted builds to continue" ).create( FAIL_AT_END ) );
-        options.addOption( OptionBuilder.withLongOpt( "fail-never" ).withDescription( "NEVER fail the build, regardless of project result" ).create( FAIL_NEVER ) );
-        options.addOption( OptionBuilder.withLongOpt( "resume-from" ).hasArg().withDescription( "Resume reactor from specified project" ).create( RESUME_FROM ) );
-        options.addOption( OptionBuilder.withLongOpt( "projects" ).withDescription( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path" ).hasArg().create( PROJECT_LIST ) );
-        options.addOption( OptionBuilder.withLongOpt( "also-make" ).withDescription( "If project list is specified, also build projects required by the list" ).create( ALSO_MAKE ) );
-        options.addOption( OptionBuilder.withLongOpt( "also-make-dependents" ).withDescription( "If project list is specified, also build projects that depend on projects on the list" ).create( ALSO_MAKE_DEPENDENTS ) );
-        options.addOption( OptionBuilder.withLongOpt( "log-file" ).hasArg().withDescription( "Log file where all build output will go (disables output color)" ).create( LOG_FILE ) );
-        options.addOption( OptionBuilder.withLongOpt( "show-version" ).withDescription( "Display version information WITHOUT stopping build" ).create( SHOW_VERSION ) );
-        options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasOptionalArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
-        options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasOptionalArg().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 _remote.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
-        options.addOption( OptionBuilder.withLongOpt( "builder" ).hasArg().withDescription( "The id of the build strategy to use" ).create( BUILDER ) );
+        options.addOption( Option.builder( HELP ).longOpt( "help" ).desc( "Display help information" ).build() );
+        options.addOption( Option.builder( ALTERNATE_POM_FILE ).longOpt( "file" ).hasArg().desc( "Force the use of an alternate POM file (or directory with pom.xml)" ).build() );
+        options.addOption( Option.builder( SET_SYSTEM_PROPERTY ).longOpt( "define" ).hasArgs().valueSeparator().desc( "Define a system property" ).build() );
+        options.addOption( Option.builder( OFFLINE ).longOpt( "offline" ).desc( "Work offline" ).build() );
+        options.addOption( Option.builder( VERSION ).longOpt( "version" ).desc( "Display version information" ).build() );
+        options.addOption( Option.builder( QUIET ).longOpt( "quiet" ).desc( "Quiet output - only show errors" ).build() );
+        options.addOption( Option.builder( DEBUG ).longOpt( "debug" ).desc( "Produce execution debug output" ).build() );
+        options.addOption( Option.builder( ERRORS ).longOpt( "errors" ).desc( "Produce execution error messages" ).build() );
+        options.addOption( Option.builder( NON_RECURSIVE ).longOpt( "non-recursive" ).desc( "Do not recurse into sub-projects" ).build() );
+        options.addOption( Option.builder( UPDATE_SNAPSHOTS ).longOpt( "update-snapshots" ).desc( "Forces a check for missing releases and updated snapshots on remote repositories" ).build() );
+        options.addOption( Option.builder( ACTIVATE_PROFILES ).longOpt( "activate-profiles" ).desc( "Comma-delimited list of profiles to activate" ).hasArg().build() );
+        options.addOption( Option.builder( BATCH_MODE ).longOpt( "batch-mode" ).desc( "Run in non-interactive (batch) mode (disables output color)" ).build() );
+        options.addOption( Option.builder( SUPRESS_SNAPSHOT_UPDATES ).longOpt( "no-snapshot-updates" ).desc( "Suppress SNAPSHOT updates" ).build() );
+        options.addOption( Option.builder( CHECKSUM_FAILURE_POLICY ).longOpt( "strict-checksums" ).desc( "Fail the build if checksums don't match" ).build() );
+        options.addOption( Option.builder( CHECKSUM_WARNING_POLICY ).longOpt( "lax-checksums" ).desc( "Warn if checksums don't match" ).build() );
+        options.addOption( Option.builder( ALTERNATE_USER_SETTINGS ).longOpt( "settings" ).hasArg().desc( "Alternate path for the user settings file" ).build() );
+        options.addOption( Option.builder( ALTERNATE_GLOBAL_SETTINGS ).longOpt( "global-settings" ).hasArg().desc( "Alternate path for the global settings file" ).build() );
+        options.addOption( Option.builder( ALTERNATE_USER_TOOLCHAINS ).longOpt( "toolchains" ).hasArg().desc( "Alternate path for the user toolchains file" ).hasArg().build() );
+        options.addOption( Option.builder( ALTERNATE_GLOBAL_TOOLCHAINS ).longOpt( "global-toolchains" ).desc( "Alternate path for the global toolchains file" ).hasArg().build() );
+        options.addOption( Option.builder( FAIL_FAST ).longOpt( "fail-fast" ).desc( "Stop at first failure in reactorized builds" ).build() );
+        options.addOption( Option.builder( FAIL_AT_END ).longOpt( "fail-at-end" ).desc( "Only fail the build afterwards; allow all non-impacted builds to continue" ).build() );
+        options.addOption( Option.builder( FAIL_NEVER ).longOpt( "fail-never" ).desc( "NEVER fail the build, regardless of project result" ).build() );
+        options.addOption( Option.builder( RESUME_FROM ).longOpt( "resume-from" ).hasArg().desc( "Resume reactor from specified project" ).build() );
+        options.addOption( Option.builder( PROJECT_LIST ).longOpt( "projects" ).desc( "Comma-delimited list of specified reactor projects to build instead of all projects. A project can be specified by [groupId]:artifactId or by its relative path." ).hasArg().build() );
+        options.addOption( Option.builder( ALSO_MAKE ).longOpt( "also-make" ).desc( "If project list is specified, also build projects required by the list" ).build() );
+        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( 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() );
 
         // 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" ) );
-        options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );
-        options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );
-        options.addOption( OptionBuilder.withLongOpt( "no-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npu" ) );
+        options.addOption( Option.builder( "npr" ).longOpt( "no-plugin-registry" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+        options.addOption( Option.builder( "cpu" ).longOpt( "check-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+        options.addOption( Option.builder( "up" ).longOpt( "update-plugins" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+        options.addOption( Option.builder( "npu" ).longOpt( "no-plugin-updates" ).desc( "Ineffective, only kept for backward compatibility" ).build() );
+
     }
+    // CHECKSTYLE_ON: LineLength
 
     public CommandLine parse( String[] args )
         throws ParseException
@@ -154,7 +156,7 @@ public class CLIManager
         // We need to eat any quotes surrounding arguments...
         String[] cleanArgs = CleanArgument.cleanArgs( args );
 
-        CommandLineParser parser = new GnuParser();
+        CommandLineParser parser = new DefaultParser();
 
         return parser.parse( options, cleanArgs );
     }