From 92cb195bf22c4697c9a2e3528859ff6f83cb7006 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 27 Jul 2022 10:17:56 +0200 Subject: Install javax.servlet-api for all containers. - Used by zkfacade. --- .../java/com/yahoo/vespa/model/container/PlatformBundles.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config-model/src') 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 7ca843cf1ce..cd2700d64e4 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 @@ -36,15 +36,15 @@ public class PlatformBundles { public static final Set COMMON_VESPA_BUNDLES = toBundlePaths( "container-spifly.jar", // Aries SPIFly repackaged "zkfacade", - "zookeeper-server" // TODO: not necessary in metrics-proxy. + "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" ); public static final Set VESPA_SECURITY_BUNDLES = toBundlePaths( "jdisc-security-filters", - "vespa-athenz", - // Used by vespa-athenz and imported by nearly all hosted apps. - // TODO Vespa 9: stop installing and providing servlet-api - "javax.servlet-api-3.1.0.jar" + "vespa-athenz" ); public static final Set SEARCH_AND_DOCPROC_BUNDLES = toBundlePaths( -- cgit v1.2.3