Merge pull request #23313 from vespa-engine/bjorncs/bundles

Bjorncs/bundles

5 files changed, 16 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index f303da6c9f0..1da5e190c70 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -49,7 +49,7 @@ public class ClusterControllerContainer extends Container implements
     private static final int DEFAULT_NETTY_NUM_DIRECT_ARENAS = 1; // Reduced from nettys default of 2*cores
     private static final int DEFAULT_NETTY_NUM_HEAP_ARENAS = 1; // Reduced from nettys default of 2*cores
 
-    private final Set<String> bundles = new TreeSet<>();
+    private final Set<String> bundles = new TreeSet<>(); // Ensure stable ordering
 
     public ClusterControllerContainer(AbstractConfigProducer<?> parent,
                                       int index,
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 2b6efab3389..cb4fe8f67ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -36,7 +36,6 @@ import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
-import com.yahoo.vespa.model.container.docproc.DocprocChains;
 import com.yahoo.vespa.model.utils.FileSender;
 
 import java.util.ArrayList;
@@ -115,6 +114,14 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
 
         addMetricsHandlers();
         addTestrunnerComponentsIfTester(deployState);
+        addPlatformBundlesForApplicationCluster();
+    }
+
+    private void addPlatformBundlesForApplicationCluster() {
+        Set<String> bundles = Set.of(
+                "container-search-and-docproc", "container-search-gui", "docprocs",
+                "linguistics-components", "vespaclient-container-plugin");
+        bundles.forEach(b -> addPlatformBundle(PlatformBundles.absoluteBundlePath(b)));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 47633fc5191..3d4b6dcbe7e 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -29,8 +29,8 @@ import com.yahoo.metrics.simple.runtime.MetricProperties;
 import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.prelude.semantics.SemanticRulesConfig;
 import com.yahoo.search.config.IndexInfoConfig;
-import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.search.config.QrStartConfig;
+import com.yahoo.search.config.SchemaInfoConfig;
 import com.yahoo.search.pagetemplates.PageTemplatesConfig;
 import com.yahoo.search.query.profile.config.QueryProfilesConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
@@ -64,12 +64,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeSet;
 
 /**
  * Parent class for all container cluster types.
@@ -140,7 +140,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     private boolean rpcServerEnabled = true;
     private boolean httpServerEnabled = true;
 
-    private final Set<Path> platformBundles = new LinkedHashSet<>();
+    private final Set<Path> platformBundles = new TreeSet<>(); // Ensure stable ordering
 
     private final ComponentGroup<Component<?, ?>> componentGroup;
     private final boolean isHostedVespa;
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 95f54e5d932..3e42b924ec6 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -188,13 +188,8 @@
                 <!-- Vespa bundles -->
                 config-bundle-jar-with-dependencies.jar,
                 configdefinitions-jar-with-dependencies.jar,
-                container-search-and-docproc-jar-with-dependencies.jar,
-                container-search-gui-jar-with-dependencies.jar,
-                docprocs-jar-with-dependencies.jar,
                 hosted-zone-api-jar-with-dependencies.jar,
                 jdisc-security-filters-jar-with-dependencies.jar,
-                linguistics-components-jar-with-dependencies.jar,
-                vespaclient-container-plugin-jar-with-dependencies.jar,
                 vespa-athenz-jar-with-dependencies.jar,
 
                 <!-- Apache http client repackaged as bundle -->
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index 86cad2ad012..557fb1493f1 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -99,8 +99,12 @@
             config-model-api-jar-with-dependencies.jar,
             config-model-jar-with-dependencies.jar,
             container-disc-jar-with-dependencies.jar,
+            <!-- START config-model dependencies -->
+            container-search-and-docproc-jar-with-dependencies.jar,
+            linguistics-components-jar-with-dependencies.jar,
             model-evaluation-jar-with-dependencies.jar,
             model-integration-jar-with-dependencies.jar,
+            <!-- END config-model dependencies -->
           </discPreInstallBundle>
         </configuration>
       </plugin>