diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-12 21:16:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-12 21:16:29 +0200 |
commit | 7060f6a27b43e3e3265ba26f6eed8481b6ceb0f4 (patch) | |
tree | 866db52ed766ce7c5da390c430f2fee50eb36ef5 /vespa-enforcer-extensions | |
parent | 0d1c470292b17ac405ffd854882f9ee1e84dd368 (diff) | |
parent | d28840e6f4cebe358bf953952e0f831744ac03a0 (diff) |
Merge pull request #28893 from vespa-engine/bjorncs/guess-property-by-default
Guess property for version by default
Diffstat (limited to 'vespa-enforcer-extensions')
-rw-r--r-- | vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java index 9c943bb2341..77f097e3b88 100644 --- a/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java +++ b/vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java @@ -76,7 +76,11 @@ public class AllowedDependencies extends AbstractEnforcerRule implements Enforce var spec = loadDependencySpec(specFile); var resolved = resolve(spec, dependencies); if (System.getProperties().containsKey(WRITE_SPEC_PROP)) { - writeDependencySpec(specFile, resolved, System.getProperties().containsKey(GUESS_VERSION)); + // Guess property for version by default, can be disabled with <prop>=false + var guessProperty = Optional.ofNullable(System.getProperty(GUESS_VERSION)) + .map(p -> p.isEmpty() || Boolean.parseBoolean(p)) + .orElse(true); + writeDependencySpec(specFile, resolved, guessProperty); getLog().info("Updated spec file '%s'".formatted(specFile.toString())); } else { warnOnDuplicateVersions(resolved); |