diff options
| author | gjoranv <gjoranv@gmail.com> | 2022-07-28 00:14:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 00:14:27 +0200 |
| commit | b95b38590737137a362aa29492a070ac7ba60a40 (patch) | |
| tree | d490ab6d4d988dbf1b8b5a6d83a140c3c92212a4 /config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java | |
| parent | 327a3760696082caf913ae9ebc30a3a53266a5d5 (diff) | |
| parent | 14a762ca09ff8ff9d29b2ae52618a1271c48b7d4 (diff) | |
Merge pull request #23544 from vespa-engine/dont-install-zookeeper-in-metrics-proxyv8.25.9
Don't install bundle 'zookeeper-server' in metrics-proxy. [run-systemtest]
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java index cd2700d64e4..7ce82848d09 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java @@ -35,8 +35,6 @@ public class PlatformBundles { // Bundles that must be loaded for all container types. public static final Set<Path> COMMON_VESPA_BUNDLES = toBundlePaths( "container-spifly.jar", // Aries SPIFly repackaged - "zkfacade", - "zookeeper-server", // TODO: not necessary in metrics-proxy. // Used by vespa-athenz, zkfacade, other vespa bundles and nearly all hosted apps. // TODO Vespa 9: stop installing and providing servlet-api. Seems difficult, though. "javax.servlet-api-3.1.0.jar" @@ -47,6 +45,11 @@ public class PlatformBundles { "vespa-athenz" ); + public static final Set<Path> VESPA_ZK_BUNDLES = toBundlePaths( + "zkfacade", + "zookeeper-server" + ); + public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = toBundlePaths( SEARCH_AND_DOCPROC_BUNDLE, "container-search-gui", |