You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/05/17 10:57:08 UTC
[maven-mvnd] branch master updated: Fix version display (fixes #838)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
The following commit(s) were added to refs/heads/master by this push:
new 8dfc265b Fix version display (fixes #838)
8dfc265b is described below
commit 8dfc265bd900a1264b7a8c3fe05e12f8e3f45a1b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon May 15 21:43:19 2023 +0200
Fix version display (fixes #838)
---
.../java/org/apache/maven/cli/DaemonMavenCli.java | 20 +++++++++++++-------
.../java/org/apache/maven/cli/DaemonMavenCli.java | 20 +++++++++++++-------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index ebc4dba0..7ddc2515 100644
--- a/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -227,11 +227,11 @@ public class DaemonMavenCli implements DaemonCli {
environment(cliRequest.workingDirectory, clientEnv);
cli(cliRequest);
properties(cliRequest);
- help(cliRequest);
logging(cliRequest);
+ informativeCommands(cliRequest);
+ version(cliRequest);
container(cliRequest);
configure(cliRequest, eventSpyDispatcher, configurationProcessors);
- version(cliRequest);
toolchains(cliRequest);
populateRequest(cliRequest);
encryption(cliRequest);
@@ -296,11 +296,20 @@ public class DaemonMavenCli implements DaemonCli {
}
}
- private void help(CliRequest cliRequest) throws Exception {
+ private void informativeCommands(CliRequest cliRequest) throws Exception {
if (cliRequest.commandLine.hasOption(CLIManager.HELP)) {
buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager()));
throw new ExitException(0);
}
+
+ if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
+ if (cliRequest.commandLine.hasOption(CLIManager.QUIET)) {
+ buildEventListener.log(CLIReportingUtils.showVersionMinimal());
+ } else {
+ buildEventListener.log(CLIReportingUtils.showVersion());
+ }
+ throw new ExitException(0);
+ }
}
private CLIManager newCLIManager() {
@@ -416,11 +425,8 @@ public class DaemonMavenCli implements DaemonCli {
}
private void version(CliRequest cliRequest) throws ExitException {
- if (cliRequest.debug || cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
+ if (cliRequest.debug || cliRequest.commandLine.hasOption(CLIManager.SHOW_VERSION)) {
buildEventListener.log(CLIReportingUtils.showVersion());
- if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
- throw new ExitException(0);
- }
}
}
diff --git a/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index bda30f63..1a8f8477 100644
--- a/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -216,11 +216,11 @@ public class DaemonMavenCli implements DaemonCli {
environment(cliRequest.workingDirectory, clientEnv);
cli(cliRequest);
properties(cliRequest);
- help(cliRequest);
logging(cliRequest);
+ informativeCommands(cliRequest);
+ version(cliRequest);
container(cliRequest);
configure(cliRequest, eventSpyDispatcher, configurationProcessors);
- version(cliRequest);
toolchains(cliRequest);
populateRequest(cliRequest);
encryption(cliRequest);
@@ -285,11 +285,20 @@ public class DaemonMavenCli implements DaemonCli {
}
}
- private void help(CliRequest cliRequest) throws Exception {
+ private void informativeCommands(CliRequest cliRequest) throws Exception {
if (cliRequest.commandLine.hasOption(CLIManager.HELP)) {
buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager()));
throw new ExitException(0);
}
+
+ if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
+ if (cliRequest.commandLine.hasOption(CLIManager.QUIET)) {
+ buildEventListener.log(CLIReportingUtils.showVersionMinimal());
+ } else {
+ buildEventListener.log(CLIReportingUtils.showVersion());
+ }
+ throw new ExitException(0);
+ }
}
private CLIManager newCLIManager() {
@@ -400,11 +409,8 @@ public class DaemonMavenCli implements DaemonCli {
}
private void version(CliRequest cliRequest) throws ExitException {
- if (cliRequest.verbose || cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
+ if (cliRequest.verbose || cliRequest.commandLine.hasOption(CLIManager.SHOW_VERSION)) {
buildEventListener.log(CLIReportingUtils.showVersion());
- if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
- throw new ExitException(0);
- }
}
}