diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-29 13:15:48 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-01 13:55:11 +0200 |
| commit | 6b2d7d130008ae83b91094b9aab4716eb3b4d55c (patch) | |
| tree | 02367f8f9a043dabb36377f8cc19f51214052766 | |
| parent | e4265f852d20675d873489973b3745580d2b3c5b (diff) | |
Only add search/docproc/feed bundles when required
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 9 | ||||
| -rw-r--r-- | container-disc/pom.xml | 5 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 4 |
3 files changed, 12 insertions, 6 deletions
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/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> |