Retrieve provided artifacts from custom header instead of Class-Path

2 files changed, 8 insertions, 4 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateProvidedArtifactManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateProvidedArtifactManifestMojo.java
index 05b679f3bfe..ee35c559e48 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateProvidedArtifactManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateProvidedArtifactManifestMojo.java
@@ -29,6 +29,8 @@ import java.util.jar.Manifest;
 @Mojo(name = "generate-provided-artifact-manifest", requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
 public class GenerateProvidedArtifactManifestMojo extends AbstractMojo {
 
+    public static final String PROVIDED_ARTIFACTS_MANIFEST_ENTRY = "X-JDisc-Provided-Artifact";
+
     @Parameter(defaultValue = "${project}")
     public MavenProject project;
 
@@ -84,8 +86,8 @@ public class GenerateProvidedArtifactManifestMojo extends AbstractMojo {
             var providedArtifacts = attributes.getValue("Class-Path");
             if (providedArtifacts == null) return;
 
-            attributes.remove(new Attributes.Name( "Class-Path"));
-            attributes.putValue("X-JDisc-Provided-Artifact", providedArtifacts.replace(" ", ","));
+            attributes.remove(new Attributes.Name("Class-Path"));
+            attributes.putValue(PROVIDED_ARTIFACTS_MANIFEST_ENTRY, providedArtifacts.replace(" ", ","));
             attributes.putValue("Created-By", "vespa container maven plugin");
         }
 
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
index f5f0de70ea7..c65e150c356 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/util/JarFiles.java
@@ -12,6 +12,8 @@ import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import static com.yahoo.container.plugin.mojo.GenerateProvidedArtifactManifestMojo.PROVIDED_ARTIFACTS_MANIFEST_ENTRY;
+
 /**
  * @author Tony Vaagenes
  * @author ollivir
@@ -19,8 +21,8 @@ import java.util.zip.ZipFile;
 public class JarFiles {
 
     public static List<ArtifactInfo> providedArtifactsFromClassPath(File jarFile) {
-        return getManifest(jarFile).map(mf -> getMainAttributeValue(mf, "Class-Path")
-                        .map(s -> Arrays.stream(s.split(" "))
+        return getManifest(jarFile).map(mf -> getMainAttributeValue(mf, PROVIDED_ARTIFACTS_MANIFEST_ENTRY)
+                        .map(s -> Arrays.stream(s.split(","))
                                 .map(ArtifactInfo::fromStringValue)
                                 .toList())
                         .orElse(Collections.emptyList()))