maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject [4/5] maven git commit: fixed documentation errors
Date Thu, 23 Feb 2017 21:00:52 GMT
fixed documentation errors

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

Branch: refs/heads/MNG-6170
Commit: 0db5e32cf59851086e895f1f541853b61df38121
Parents: dc9c4db
Author: Hervé Boutemy <hboutemy@apache.org>
Authored: Thu Feb 23 19:07:58 2017 +0100
Committer: Hervé Boutemy <hboutemy@apache.org>
Committed: Thu Feb 23 19:07:58 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/maven/cli/CLIManager.java       | 8 ++++----
 maven-model-builder/src/site/apt/index.apt                   | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/0db5e32c/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 673f52d..a9038bf 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
@@ -108,7 +108,7 @@ public class 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, disables output color)"
).create( ALTERNATE_POM_FILE ) );
+        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 ) );
@@ -130,16 +130,16 @@ public class CLIManager
         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( "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." ).create( LOG_FILE ) );
+        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( OptionBuilder.withLongOpt( "builder" ).hasArg().withDescription(
"The id of the build strategy to use" ).create( BUILDER ) );
 
         // 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/0db5e32c/maven-model-builder/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index 280c3b1..a14b4e3 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -57,12 +57,6 @@ Maven Model Builder
 
    ** parent resolution until {{{./super-pom.html}super-pom}}
 
-   []
-
- * phase 2, with optional plugin processing
-
-   ** dependency management import (for dependencies of type <<<pom>>>
in the <<<\<dependencyManagement\>>>> section)
-
    ** inheritance assembly (see {{{./index.html#Inheritance_Assembly}below}})
 
    ** model interpolation (see {{{./index.html#Model_Interpolation}below}})


Mime
View raw message