Skip to content

Commit

Permalink
Add more discriminating properties to the daemon
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
oehme authored and ppalaga committed Dec 8, 2022
1 parent eedcb77 commit 866a7c6
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 866a7c6

Please sign in to comment.