diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-07-26 12:19:19 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-07-26 12:19:19 +0200 |
| commit | a449236a1a394f0d1ccaad17927d916030db46af (patch) | |
| tree | bb48b1d2e2082b52a545d4e943cb76f37108832b /config-model | |
| parent | ff6b4df9c323318ef884983b45ebdc0470d77b77 (diff) | |
Move installing of servlet-api bundle to config-model.
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 | 3 |
2 files changed, 5 insertions, 0 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 |