diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java | 6 | ||||
| -rw-r--r-- | container-disc/pom.xml | 19 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 9 |
3 files changed, 19 insertions, 15 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 f8691dcde53..a330d80c2f9 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 @@ -34,12 +34,16 @@ public class PlatformBundles { // Bundles that must be loaded for all container types. public static final Set<Path> commonVespaBundles = Stream.of( + "container-apache-http-client-bundle-jar-with-dependencies.jar", // Apache http client repackaged + "container-spifly.jar", // Aries SPIFly repackaged + "hosted-zone-api-jar-with-dependencies.jar", + "security-utils.jar", "zkfacade", "zookeeper-server" // TODO: not necessary in metrics-proxy. ).map(PlatformBundles::absoluteBundlePath).collect(Collectors.toSet()); public static final Set<Path> SEARCH_AND_DOCPROC_BUNDLES = Stream.of( - PlatformBundles.SEARCH_AND_DOCPROC_BUNDLE, + SEARCH_AND_DOCPROC_BUNDLE, "container-search-gui", "docprocs", "linguistics-components" diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 3e42b924ec6..1dbc1ba1129 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -185,26 +185,17 @@ <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass> <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> - <!-- Vespa bundles --> + <!-- Bundles needed to retrieve config --> config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, - hosted-zone-api-jar-with-dependencies.jar, + jdisc-security-filters-jar-with-dependencies.jar, vespa-athenz-jar-with-dependencies.jar, - <!-- Apache http client repackaged as bundle --> - container-apache-http-client-bundle-jar-with-dependencies.jar, - - <!-- Vespa security utils with necessary 3rd party bundles --> - security-utils.jar, - bcpkix-jdk15on-${bouncycastle.version}.jar, - bcprov-jdk15on-${bouncycastle.version}.jar, - - <!-- TODO Vespa 9 Stop providing servlet-api 3.x --> - javax.servlet-api-3.1.0.jar, + javax.servlet-api-3.1.0.jar, <!-- TODO: Move to model, only needed for application container clusters --> - <!-- Aries SPIFly repackaged --> - container-spifly.jar, + bcpkix-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> + bcprov-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> jackson-annotations-${jackson2.version}.jar, jackson-core-${jackson2.version}.jar, diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index 3776743cbd8..b2b18645bcd 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -99,7 +99,16 @@ config-bundle-jar-with-dependencies.jar, config-model-api-jar-with-dependencies.jar, config-model-jar-with-dependencies.jar, + container-disc-jar-with-dependencies.jar, + + <!-- START bundles that can be moved to config-model when all standalone containers are set up via the model --> + container-apache-http-client-bundle-jar-with-dependencies.jar, + container-spifly.jar, <!-- Aries SPIFly repackaged --> + hosted-zone-api-jar-with-dependencies.jar, + security-utils.jar, + <!-- END bundles that can be moved to config-model --> + <!-- START config-model dependencies --> container-search-and-docproc-jar-with-dependencies.jar, linguistics-components-jar-with-dependencies.jar, |