diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-31 15:46:08 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-31 15:46:08 +0200 |
| commit | 900f061732411d6dbccf19eb6a81dd32a36712c9 (patch) | |
| tree | b9db0aa46a2d251d141eb48737c9d4f2bb26e501 /config-model | |
| parent | 549ed4f595f2074923c112f553d126f47685c2b2 (diff) | |
Output deployment warning on import of Jetty packages
Diffstat (limited to 'config-model')
3 files changed, 10 insertions, 3 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 a1024425124..1e3b27bc2fa 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 @@ -84,7 +84,10 @@ public class BundleValidator extends AbstractBundleValidator { ORG_JSON("org.json:json", "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")); + Set.of("org\\.json")), + JETTY("jetty", "The Jetty bundles are no longer provided on Vespa 8 - " + + "see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime.", + Set.of("org\\.eclipse\\.jetty.*")); final String name; final Collection<Predicate<String>> javaPackageMatchers; diff --git a/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF b/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF index 760a9ecf00f..3185bfb2879 100644 --- a/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF +++ b/config-model/src/test/cfg/application/validation/testjars/import-warnings/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 7.0.0 Created-By: vespa container maven plugin Bundle-Name: my-bundle Bundle-Vendor: Yahoo! -Import-Package: org.json;version="[0.0.0,1)" +Import-Package: org.json;version="[0.0.0,1)",org.eclipse.jetty.client.api;version="[9.4.46,10)" 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 b5b93be6cd7..facd3cfdff4 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 @@ -63,9 +63,13 @@ public class BundleValidatorTest { BundleValidator validator = new BundleValidator(); JarFile jarFile = createTemporaryJarFile("import-warnings"); validator.validateJarFile(state, jarFile); - assertThat(buffer.toString()) + String output = buffer.toString(); + assertThat(output) .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."); + assertThat(output) + .contains("JAR file 'import-warnings.jar' imports the packages [org.eclipse.jetty.client.api] from 'jetty'. \n" + + "The Jetty bundles are no longer provided on Vespa 8 - see https://docs.vespa.ai/en/vespa8-release-notes.html#container-runtime."); } private DeployState createDeployState(StringBuffer buffer) { |