diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java')
-rw-r--r-- | vespa-enforcer-extensions/src/main/java/com/yahoo/vespa/maven/plugin/enforcer/AllowedDependencies.java | 9 |
1 files changed, 7 insertions, 2 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 656e2f52558..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 @@ -1,3 +1,4 @@ +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.maven.plugin.enforcer; import org.apache.maven.artifact.Artifact; @@ -75,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); @@ -217,7 +222,7 @@ public class AllowedDependencies extends AbstractEnforcerRule implements Enforce resolved.matchedRules().forEach(r -> content.add(r.asString())); resolved.unmatchedDeps().forEach(d -> content.add(d.asString(guessVersion ? project.getProperties() : null))); try (var out = Files.newBufferedWriter(specFile)) { - out.write("# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n\n"); + out.write("# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.\n\n"); for (var line : content) { out.write(line); out.write('\n'); } |