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 2022/08/29 21:15:20 UTC
[maven-mvnd] branch master updated: Ability to configure the daemon storage location, fixes #673 (#678)
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 5e59c40 Ability to configure the daemon storage location, fixes #673 (#678)
5e59c40 is described below
commit 5e59c404535ba21b925a372340c7b11749aa4050
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Aug 29 23:15:15 2022 +0200
Ability to configure the daemon storage location, fixes #673 (#678)
---
client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java | 2 ++
common/src/main/java/org/mvndaemon/mvnd/common/Environment.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index e139e5c..f392c48 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@ -191,7 +191,9 @@ public class DaemonParameters {
public Path daemonStorage() {
return value(Environment.MVND_DAEMON_STORAGE)
+ .orEnvironmentVariable()
.orSystemProperty()
+ .orLocalProperty(provider, globalPropertiesPath())
.orDefault(
() -> userHome().resolve(".m2/mvnd/registry/" + BuildProperties.getInstance().getVersion()).toString())
.asPath();
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
index 472f04a..c703059 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
@@ -125,7 +125,7 @@ public enum Environment {
* The directory under which the daemon stores its registry, log files, etc.
* Default: <code>${user.home}/.m2/mvnd</code>
*/
- MVND_DAEMON_STORAGE("mvnd.daemonStorage", null, null, OptionType.PATH, Flags.NONE),
+ MVND_DAEMON_STORAGE("mvnd.daemonStorage", "MVND_DAEMON_STORAGE", null, OptionType.PATH, Flags.NONE),
/**
* The path to the daemon registry.
* Default: <code>${mvnd.daemonStorage}/registry.bin</code>