diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-13 15:09:04 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-01-13 15:09:04 +0100 |
commit | 1018ff48b1bc5f463f434d69b3b1cfae1a81ac49 (patch) | |
tree | d121ee8eb21291af9842ac9e81c7f24434d08d82 /config-model/src | |
parent | cfdd42d95c39a064abaacd659bf0e09a206aa818 (diff) |
Simplify warnings
Diffstat (limited to 'config-model/src')
2 files changed, 8 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java index d89d2f166cd..87a84911d3e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/BundleValidator.java @@ -164,9 +164,8 @@ public class BundleValidator extends Validator { for (DeprecatedMavenArtifact deprecatedArtifact : DeprecatedMavenArtifact.values()) { if (groupId.equals(deprecatedArtifact.groupId) && artifactId.equals(deprecatedArtifact.artifactId)) { deployLogger.logApplicationPackage(Level.WARNING, - String.format("For pom.xml in '%s': \n" + - "The dependency %s:%s is listed below dependencies. \n" + - "%s", + String.format( + "The pom.xml of bundle '%s' includes a dependency to the artifact '%s:%s'. \n%s", jarFilename, groupId, artifactId, deprecatedArtifact.description)); } } @@ -180,7 +179,7 @@ public class BundleValidator extends Validator { private enum DeprecatedMavenArtifact { VESPA_HTTP_CLIENT_EXTENSION("com.yahoo.vespa", "vespa-http-client-extensions", - "The 'vespa-http-client-extensions' artifact will be removed in Vespa 8. " + + "This artifact will be removed in Vespa 8. " + "Programmatic use can be safely removed from system/staging tests. " + "See internal Vespa 8 release notes for details."); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java index 5532a2d1e3a..ef4353d02fb 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/BundleValidatorTest.java @@ -77,10 +77,11 @@ public class BundleValidatorTest { JarFile jarFile = createTemporaryJarFile("pom-xml-warnings"); validator.validateJarFile(logger, jarFile); assertThat(buffer.toString()) - .contains("For pom.xml in 'pom-xml-warnings.jar': \n" + - "The dependency com.yahoo.vespa:vespa-http-client-extensions is listed below dependencies. \n" + - "The 'vespa-http-client-extensions' artifact will be removed in Vespa 8. " + - "Programmatic use can be safely removed from system/staging tests. See internal Vespa 8 release notes for details."); + .contains("The pom.xml of bundle 'pom-xml-warnings.jar' includes a dependency to the artifact " + + "'com.yahoo.vespa:vespa-http-client-extensions'. \n" + + "This artifact will be removed in Vespa 8. " + + "Programmatic use can be safely removed from system/staging tests. " + + "See internal Vespa 8 release notes for details.\n"); } private JarFile createTemporaryJarFile(String testArtifact) throws IOException { |