Merge pull request #13913 from vespa-engine/gjoranv/allow-preinstall-per-bundle

Gjoranv/allow preinstall per bundle

5 files changed, 7 insertions, 5 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index 892eb9aac05..31c8049b0dd 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -57,12 +57,12 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo {
     private String mainClass = null;
 
     @Parameter(defaultValue = "false")
-    private boolean buildVespaPlatformBundle;
+    private boolean buildLegacyVespaPlatformBundle;
 
     public void execute() throws MojoExecutionException {
         try {
-            if (discPreInstallBundle != null && ! buildVespaPlatformBundle)
-                throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by Vespa platform bundles.");
+            if (discPreInstallBundle != null && !buildLegacyVespaPlatformBundle)
+                throw new MojoExecutionException("The 'discPreInstallBundle' parameter can only be used by legacy Vespa platform bundles.");
 
             Artifacts.ArtifactSet artifactSet = Artifacts.getArtifacts(project);
             warnOnUnsupportedArtifacts(artifactSet.getNonJarArtifacts());
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 48872d0665b..1caf66e29dc 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -181,7 +181,8 @@
         <artifactId>bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass>
+            <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass>
+            <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
             <discPreInstallBundle>
                 <!-- Vespa bundles -->
                 config-bundle-jar-with-dependencies.jar,
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
index bd8c77bc9cc..b140e66f28a 100644
--- a/jdisc_http_service/pom.xml
+++ b/jdisc_http_service/pom.xml
@@ -140,6 +140,7 @@
         <artifactId>bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
+          <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
           <discPreInstallBundle>
             javax.servlet-api-3.1.0.jar,
             jetty-continuation-${jetty.version}.jar,
diff --git a/parent/pom.xml b/parent/pom.xml
index a77750b9132..ce40eb464fc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,7 +255,6 @@
                     <artifactId>bundle-plugin</artifactId>
                     <version>${project.version}</version>
                     <configuration>
-                        <buildVespaPlatformBundle>true</buildVespaPlatformBundle>
                         <configGenVersion>${project.version}</configGenVersion>
                         <useCommonAssemblyIds>true</useCommonAssemblyIds>
                     </configuration>
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index b9062b9284c..479a76e2fc6 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -81,6 +81,7 @@
         <extensions>true</extensions>
         <configuration>
           <discApplicationClass>com.yahoo.container.standalone.StandaloneContainerApplication</discApplicationClass>
+          <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle>
           <discPreInstallBundle>
             configdefinitions-jar-with-dependencies.jar,
             config-provisioning-jar-with-dependencies.jar,