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 98185363..ad0accbc 100644 --- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java +++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java @@ -207,7 +207,7 @@ public class DaemonParameters { } public Path logbackConfigurationPath() { - return property(Environment.LOGBACK_CONFIGURATION_FILE) + return property(Environment.MVND_LOGBACK) .orDefault(() -> mvndHome().resolve("conf/logback.xml").toString()) .orFail() .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 df9f3066..f913d812 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java @@ -60,7 +60,9 @@ public enum Environment { /** * The location of the Logback configuration file the daemon should use to configure its logging. */ - LOGBACK_CONFIGURATION_FILE("logback.configurationFile", null, null, OptionType.PATH, Flags.NONE), + MVND_LOGBACK("mvnd.logback", null, null, OptionType.PATH, Flags.NONE), + /** The system property expected by logback to set the configuration file */ + LOGBACK_CONFIGURATION_FILE("logback.configurationFile", null, null, OptionType.PATH, Flags.INTERNAL), // // System properties diff --git a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java index cfbbbc9d..4a72446d 100644 --- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java +++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java @@ -37,7 +37,7 @@ public class TestParameters extends DaemonParameters { .put(Environment.JAVA_HOME, javaHome) .put(Environment.MAVEN_REPO_LOCAL, localMavenRepository) .put(Environment.MAVEN_SETTINGS, settings) - .put(Environment.LOGBACK_CONFIGURATION_FILE, logbackConfigurationPath) + .put(Environment.MVND_LOGBACK, logbackConfigurationPath) .put(Environment.MVND_IDLE_TIMEOUT, TimeUtils.printDuration(idleTimeout)) .put(Environment.MVND_KEEP_ALIVE, TimeUtils.printDuration(keepAlive)) .put(Environment.MVND_MAX_LOST_KEEP_ALIVE, maxLostKeepAlive)