You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/10/17 10:13:44 UTC
[maven] branch simplify-args updated (c1dc1ff -> 7154cd3)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch simplify-args
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard c1dc1ff Simplify args help
new 7154cd3 Simplify args help
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 (c1dc1ff)
\
N -- N -- N refs/heads/simplify-args (7154cd3)
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:
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[maven] 01/01: Simplify args help
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch simplify-args
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 7154cd304a3e145c9291d31259aa9eeef4121d62
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Oct 17 10:58:44 2021 +0200
Simplify args help
---
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 4 ++--
2 files changed, 3 insertions(+), 3 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 463edaa..e15af81 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
@@ -188,7 +188,7 @@ public class CLIManager
width = HelpFormatter.DEFAULT_WIDTH;
}
- formatter.printHelp( pw, width, "mvn [options] [<goal(s)>] [<phase(s)>]",
+ formatter.printHelp( pw, width, "mvn [args]",
System.lineSeparator() + "Options:", options,
HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD,
System.lineSeparator(), false );
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 042ba40..a53ab27 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
@@ -1059,7 +1059,7 @@ public class MavenCli
if ( result.canResume() )
{
- logBuildResumeHint( "mvn <args> -r" );
+ logBuildResumeHint( "mvn [args] -r" );
}
else if ( !failedProjects.isEmpty() )
{
@@ -1072,7 +1072,7 @@ public class MavenCli
if ( !firstFailedProject.equals( sortedProjects.get( 0 ) ) )
{
String resumeFromSelector = getResumeFromSelector( sortedProjects, firstFailedProject );
- logBuildResumeHint( "mvn <args> -rf " + resumeFromSelector );
+ logBuildResumeHint( "mvn [args] -rf " + resumeFromSelector );
}
}