diff options
| -rw-r--r-- | bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java | 6 | ||||
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java index 38ca08ecff1..10f8f4e976c 100644 --- a/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java +++ b/bundle-plugin-test/src/test/java/com/yahoo/BundleIT.java @@ -109,15 +109,15 @@ public class BundleIT { assertThat(bundleClassPath, containsString(".,")); // If bundle-plugin-test is compiled in a mvn command that also built jrt, // the jrt artifact is jrt.jar, otherwise the installed and versioned artifact - // is used: jrt-6-SNAPSHOT.jar. + // is used: jrt-7-SNAPSHOT.jar. assertThat(bundleClassPath, anyOf( - containsString("dependencies/jrt-6-SNAPSHOT.jar"), + containsString("dependencies/jrt-7-SNAPSHOT.jar"), containsString("dependencies/jrt.jar"))); } @Test public void require_that_component_jar_file_contains_compile_artifacts() { - ZipEntry versionedEntry = jarFile.getEntry("dependencies/jrt-6-SNAPSHOT.jar"); + ZipEntry versionedEntry = jarFile.getEntry("dependencies/jrt-7-SNAPSHOT.jar"); ZipEntry unversionedEntry = jarFile.getEntry("dependencies/jrt.jar"); if (versionedEntry == null) { assertNotNull(unversionedEntry); diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java index b2abf13695f..4d5b0e327d5 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.java @@ -45,15 +45,15 @@ public class GenerateBundleClassPathMappingsMojo extends AbstractMojo { "bundleSymbolicName": "bundle-plugin-test", "classPathElements": [ "/Users/tonyv/Repos/vespa/bundle-plugin-test/target/classes", - "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/6-SNAPSHOT/jrt-6-SNAPSHOT.jar", - "/Users/tonyv/.m2/repository/com/yahoo/vespa/annotations/6-SNAPSHOT/annotations-6-SNAPSHOT.jar" + "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/7-SNAPSHOT/jrt-7-SNAPSHOT.jar", + "/Users/tonyv/.m2/repository/com/yahoo/vespa/annotations/7-SNAPSHOT/annotations-7-SNAPSHOT.jar" ] }, "providedDependencies": [ { "bundleSymbolicName": "jrt", "classPathElements": [ - "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/6-SNAPSHOT/jrt-6-SNAPSHOT.jar" + "/Users/tonyv/.m2/repository/com/yahoo/vespa/jrt/7-SNAPSHOT/jrt-7-SNAPSHOT.jar" ] } ] |