diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 12 | ||||
| -rw-r--r-- | container-disc/pom.xml | 5 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 2 |
3 files changed, 5 insertions, 14 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 5a1103de9a3..2b9961232ea 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -187,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addEmbedderComponents(deployState, cluster, spec); addModelEvaluation(spec, cluster, context); - addVespaBundles(cluster); addModelEvaluationBundles(cluster); addProcessing(deployState, spec, cluster); @@ -584,17 +583,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return (child != null) ? Integer.parseInt(child.getTextContent()) : defaultValue; } - private void addVespaBundles(ApplicationContainerCluster cluster) { - // Skip model-evaluation bundles for node-admin - if (cluster.id().value().equals("node-admin")) return; - - Set<String> bundles = Set.of( - "container-search-and-docproc", "container-search-gui", "docprocs", - "linguistics-components", "vespaclient-container-plugin"); - bundles.forEach(b -> cluster.addPlatformBundle(PlatformBundles.absoluteBundlePath(b))); - addModelEvaluationBundles(cluster); - } - protected void addModelEvaluationBundles(ApplicationContainerCluster cluster) { /* These bundles are added to all application container clusters, even if they haven't * declared 'model-evaluation' in services.xml, because there are many public API packages diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 3e42b924ec6..95f54e5d932 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -188,8 +188,13 @@ <!-- 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 b73212b96f6..86cad2ad012 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -99,8 +99,6 @@ config-model-api-jar-with-dependencies.jar, config-model-jar-with-dependencies.jar, container-disc-jar-with-dependencies.jar, - 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, </discPreInstallBundle> |