diff options
3 files changed, 5 insertions, 2 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 e316f826ad6..fdf2001bb68 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 @@ -105,6 +105,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat .map(HostSpec::hostname) .collect(Collectors.toCollection(() -> new LinkedHashSet<>()))); + addPlatformBundle(PlatformBundles.SERVLET_API_BUNDLE); + addSimpleComponent("com.yahoo.language.provider.DefaultLinguisticsProvider"); addSimpleComponent("com.yahoo.language.provider.DefaultEmbedderProvider"); addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider"); 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 a93fe6967b4..27db73bcf0f 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 @@ -32,6 +32,9 @@ public class PlatformBundles { public static final Path LIBRARY_PATH = Paths.get(Defaults.getDefaults().underVespaHome("lib/jars")); public static final String SEARCH_AND_DOCPROC_BUNDLE = BundleInstantiationSpecification.CONTAINER_SEARCH_AND_DOCPROC; + // TODO Vespa 9: stop installing and providing servlet-api + public static final Path SERVLET_API_BUNDLE = absoluteBundlePath("javax.servlet-api-3.1.0.jar"); + // Bundles that must be loaded for all container types. public static final Set<Path> COMMON_VESPA_BUNDLES = toBundlePaths( "container-spifly.jar", // Aries SPIFly repackaged diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 41177c221e2..a5c990ab145 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -198,8 +198,6 @@ bcpkix-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> - javax.servlet-api-3.1.0.jar, <!-- TODO: Move to model, only needed for application container clusters --> - jackson-annotations-${jackson2.version}.jar, jackson-core-${jackson2.version}.jar, jackson-databind-${jackson-databind.version}.jar, |