diff options
author | gjoranv <gv@verizonmedia.com> | 2022-07-26 12:19:19 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-07-26 14:34:13 +0200 |
commit | 1680a0512dce927432c71b4e8749c08feea9adaa (patch) | |
tree | bd96b968795fa561b8ca9fd39c1736afb58d74f9 /config-model | |
parent | a449236a1a394f0d1ccaad17927d916030db46af (diff) |
Install javax.servlet-api with vespa security bundles.
- It is currently needed by vespa-athenz.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java | 7 |
2 files changed, 5 insertions, 4 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 fdf2001bb68..e316f826ad6 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,8 +105,6 @@ 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 27db73bcf0f..41d090b5f4d 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,7 +32,6 @@ 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. @@ -44,7 +43,11 @@ public class PlatformBundles { public static final Set<Path> VESPA_SECURITY_BUNDLES = toBundlePaths( "jdisc-security-filters", - "vespa-athenz"); + "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" + ); public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = toBundlePaths( SEARCH_AND_DOCPROC_BUNDLE, |