Simplify deployment warning for deprecated bundle

2 files changed, 6 insertions, 9 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 bc4579b9aaa..a1024425124 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
@@ -75,17 +75,15 @@ public class BundleValidator extends AbstractBundleValidator {
             }
         });
         deprecatedPackagesInUse.forEach((artifact, packagesInUse) -> {
-            log(state, Level.WARNING, "For JAR file '%s': \n" +
-                    "Manifest imports the following Java packages from '%s': %s. \n" +
-                    "%s",
-                    filename(jar), artifact.name, packagesInUse, artifact.description);
+            log(state, Level.WARNING, "JAR file '%s' imports the packages %s from '%s'. \n%s",
+                    filename(jar), packagesInUse, artifact.name, artifact.description);
         });
     }
 
     private enum DeprecatedProvidedBundle {
         ORG_JSON("org.json:json",
-                "The org.json library will no longer provided by jdisc runtime on Vespa 8. " +
-                        "See https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.",
+                "This bundle is no longer provided on Vespa 8 - " +
+                        "see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.",
                 Set.of("org\\.json"));
 
         final String name;
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 506a7bbd86a..b5b93be6cd7 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
@@ -64,9 +64,8 @@ public class BundleValidatorTest {
         JarFile jarFile = createTemporaryJarFile("import-warnings");
         validator.validateJarFile(state, jarFile);
         assertThat(buffer.toString())
-                .contains("For JAR file 'import-warnings.jar': \n" +
-                        "Manifest imports the following Java packages from 'org.json:json': [org.json]. \n" +
-                        "The org.json library will no longer provided by jdisc runtime on Vespa 8. See https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.");
+                .contains("JAR file 'import-warnings.jar' imports the packages [org.json] from 'org.json:json'. \n" +
+                        "This bundle is no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.");
     }
 
     private DeployState createDeployState(StringBuffer buffer) {