From 866a7c6f3f05355e159920d88d75096129de7c53 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Wed, 7 Dec 2022 17:01:26 +0100 Subject: [PATCH] Add more discriminating properties to the daemon The local repo and maven settings are both used while resolving core extensions, which happens during daemon startup. Thus these two also need to be discriminating properties, as the core extensions themselves are discriminating. --- .../java/org/mvndaemon/mvnd/common/Environment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 6181dc9c6..9149eb8fa 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java @@ -94,9 +94,16 @@ public enum Environment { // Maven properties // /** The path to the Maven local repository */ - MAVEN_REPO_LOCAL("maven.repo.local", null, null, OptionType.PATH, Flags.NONE), + MAVEN_REPO_LOCAL("maven.repo.local", null, null, OptionType.PATH, Flags.DISCRIMINATING | Flags.OPTIONAL), /** The location of the maven settings file */ - MAVEN_SETTINGS("maven.settings", null, null, OptionType.PATH, Flags.NONE, "mvn:-s", "mvn:--settings"), + MAVEN_SETTINGS( + "maven.settings", + null, + null, + OptionType.PATH, + Flags.DISCRIMINATING | Flags.OPTIONAL, + "mvn:-s", + "mvn:--settings"), /** The pom or directory to build */ MAVEN_FILE(null, null, null, OptionType.PATH, Flags.NONE, "mvn:-f", "mvn:--file"), /** The root directory of the current multi module Maven project */