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/01/24 17:25:53 UTC
[maven-mvnd] branch mvnd-0.9.x updated (78416160 -> 657ac932)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvnd-0.9.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
from 78416160 Fix executable bit on the mvnd-bash-completion script (#756)
new c1fd53b8 Regen bash completion
new 657ac932 Fix displayed version
The 2 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:
.../main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java | 7 +++----
dist/src/main/distro/bin/mvnd-bash-completion.bash | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
[maven-mvnd] 01/02: Regen bash completion
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-0.9.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit c1fd53b8ea38410e7e9401f01618f3c2a6b3abaa
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jan 24 18:25:25 2023 +0100
Regen bash completion
---
dist/src/main/distro/bin/mvnd-bash-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist/src/main/distro/bin/mvnd-bash-completion.bash b/dist/src/main/distro/bin/mvnd-bash-completion.bash
index 102a1ef2..50f77891 100755
--- a/dist/src/main/distro/bin/mvnd-bash-completion.bash
+++ b/dist/src/main/distro/bin/mvnd-bash-completion.bash
@@ -218,7 +218,7 @@ _mvnd()
local mvnd_opts="-1"
local mvnd_long_opts="--color|--completion|--purge|--raw-streams|--serial|--status|--stop"
- local mvnd_properties="-Djava.home|-Djdk.java.options|-Dmaven.multiModuleProjectDirectory|-Dmaven.repo.local|-Dmaven.settings|-Dmvnd.buildTime|-Dmvnd.builder|-Dmvnd.daemonStorage|-Dmvnd.debug|-Dmvnd.debug.address|-Dmvnd.duplicateDaemonGracePeriod|-Dmvnd.enableAssertions|-Dmvnd.expirationCheckDelay|-Dmvnd.home|-Dmvnd.idleTimeout|-Dmvnd.jvmArgs|-Dmvnd.keepAlive|-Dmvnd.logPurgePeriod|-Dmvnd.logback|-Dmvnd.maxHeapSize|-Dmvnd.maxLostKeepAlive|-Dmvnd.minHeapSize|-Dmvnd.minThreads|-Dmvnd.no [...]
+ local mvnd_properties="-Djava.home|-Djdk.java.options|-Dmaven.multiModuleProjectDirectory|-Dmaven.repo.local|-Dmaven.settings|-Dmvnd.buildTime|-Dmvnd.builder|-Dmvnd.cancelConnectTimeout|-Dmvnd.connectTimeout|-Dmvnd.daemonStorage|-Dmvnd.debug|-Dmvnd.debug.address|-Dmvnd.duplicateDaemonGracePeriod|-Dmvnd.enableAssertions|-Dmvnd.expirationCheckDelay|-Dmvnd.home|-Dmvnd.idleTimeout|-Dmvnd.jvmArgs|-Dmvnd.keepAlive|-Dmvnd.logPurgePeriod|-Dmvnd.logback|-Dmvnd.maxHeapSize|-Dmvnd.maxLostKeepAl [...]
local opts="-am|-amd|-B|-C|-c|-cpu|-D|-e|-emp|-ep|-f|-fae|-ff|-fn|-gs|-h|-l|-N|-npr|-npu|-nsu|-o|-P|-pl|-q|-rf|-s|-T|-t|-U|-up|-V|-v|-X|${mvnd_opts}"
local long_opts="--also-make|--also-make-dependents|--batch-mode|--strict-checksums|--lax-checksums|--check-plugin-updates|--define|--errors|--encrypt-master-password|--encrypt-password|--file|--fail-at-end|--fail-fast|--fail-never|--global-settings|--help|--log-file|--non-recursive|--no-plugin-registry|--no-plugin-updates|--no-snapshot-updates|--offline|--activate-profiles|--projects|--quiet|--resume-from|--settings|--threads|--toolchains|--update-snapshots|--update-plugins|--show-v [...]
[maven-mvnd] 02/02: Fix displayed version
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-0.9.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 657ac932cfbb684960d32cbcd8166d0f1eda45bb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jan 24 18:25:46 2023 +0100
Fix displayed version
---
.../main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java
index 2089b5a0..d601de4b 100644
--- a/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java
+++ b/client/src/main/java-mvnd/org/mvndaemon/mvnd/client/DefaultClient.java
@@ -232,16 +232,15 @@ public class DefaultClient implements Client {
if (version || showVersion || debug) {
// Print mvnd version
BuildProperties buildProperties = BuildProperties.getInstance();
- final String mvndVersionString = "mvnd " + buildProperties.getVersion() + " "
+ final String mvndVersionString = "Apache Maven Daemon (mvnd) " + buildProperties.getVersion() + " "
+ (Environment.isNative()
? buildProperties.getOsName() + "-" + buildProperties.getOsArch() + " native client"
: "JVM client")
+ " (" + buildProperties.getRevision() + ")";
boolean isColored = !"never".equals(Environment.MAVEN_COLOR.getCommandLineOption(args));
- final String v = isColored
- ? mvndVersionString
- : Ansi.ansi().bold().a(mvndVersionString).reset().toString();
+ final String v =
+ isColored ? Ansi.ansi().bold().a(mvndVersionString).reset().toString() : mvndVersionString;
output.accept(Message.log(v));
// Print terminal information
output.describeTerminal();