apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-21 19:35:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix version display (fixes #838)

Browse Source
This commit is contained in:
Guillaume Nodet
2023-05-15 21:43:19 +02:00
parent 2cd9eafef6
commit 8dfc265bd9
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
daemon-m39/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -227,11 +227,11 @@ public class DaemonMavenCli implements DaemonCli {
environment(cliRequest.workingDirectory, clientEnv); environment(cliRequest.workingDirectory, clientEnv);
cli(cliRequest); cli(cliRequest);
properties(cliRequest); properties(cliRequest);
help(cliRequest);
logging(cliRequest); logging(cliRequest);
informativeCommands(cliRequest);
version(cliRequest);
container(cliRequest); container(cliRequest);
configure(cliRequest, eventSpyDispatcher, configurationProcessors); configure(cliRequest, eventSpyDispatcher, configurationProcessors);
version(cliRequest);
toolchains(cliRequest); toolchains(cliRequest);
populateRequest(cliRequest); populateRequest(cliRequest);
encryption(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)) { if (cliRequest.commandLine.hasOption(CLIManager.HELP)) {
buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager())); buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager()));
throw new ExitException(0); 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() { private CLIManager newCLIManager() {
@@ -416,11 +425,8 @@ public class DaemonMavenCli implements DaemonCli {
} }
private void version(CliRequest cliRequest) throws ExitException { 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()); buildEventListener.log(CLIReportingUtils.showVersion());
if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
throw new ExitException(0);
}
} }
} }

20
daemon-m40/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
View File

@@ -216,11 +216,11 @@ public class DaemonMavenCli implements DaemonCli {
environment(cliRequest.workingDirectory, clientEnv); environment(cliRequest.workingDirectory, clientEnv);
cli(cliRequest); cli(cliRequest);
properties(cliRequest); properties(cliRequest);
help(cliRequest);
logging(cliRequest); logging(cliRequest);
informativeCommands(cliRequest);
version(cliRequest);
container(cliRequest); container(cliRequest);
configure(cliRequest, eventSpyDispatcher, configurationProcessors); configure(cliRequest, eventSpyDispatcher, configurationProcessors);
version(cliRequest);
toolchains(cliRequest); toolchains(cliRequest);
populateRequest(cliRequest); populateRequest(cliRequest);
encryption(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)) { if (cliRequest.commandLine.hasOption(CLIManager.HELP)) {
buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager())); buildEventListener.log(MvndHelpFormatter.displayHelp(newCLIManager()));
throw new ExitException(0); 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() { private CLIManager newCLIManager() {
@@ -400,11 +409,8 @@ public class DaemonMavenCli implements DaemonCli {
} }
private void version(CliRequest cliRequest) throws ExitException { 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()); buildEventListener.log(CLIReportingUtils.showVersion());
if (cliRequest.commandLine.hasOption(CLIManager.VERSION)) {
throw new ExitException(0);
}
} }
} }