diff options
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/PlatformBundles.java | 3 | ||||
| -rw-r--r-- | container-disc/pom.xml | 13 | ||||
| -rw-r--r-- | standalone-container/pom.xml | 3 |
3 files changed, 8 insertions, 11 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 3bc50bd9039..a0bd524d31f 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,10 +34,7 @@ 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", // Apache http client repackaged "container-spifly.jar", // Aries SPIFly repackaged - "hosted-zone-api", - "security-utils.jar", "zkfacade", "zookeeper-server" // TODO: not necessary in metrics-proxy. ).map(PlatformBundles::absoluteBundlePath).collect(Collectors.toSet()); diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 1dbc1ba1129..41177c221e2 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -185,17 +185,20 @@ <discApplicationClass>com.yahoo.container.jdisc.ConfiguredApplication</discApplicationClass> <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> - <!-- Bundles needed to retrieve config --> + <!-- BEGIN Bundles needed to retrieve config, or used by container-disc --> 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, - - javax.servlet-api-3.1.0.jar, <!-- TODO: Move to model, only needed for application container clusters --> + container-apache-http-client-bundle-jar-with-dependencies.jar, + security-utils.jar, + bcprov-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> + <!-- END Bundles needed to retrieve config, or used by container-disc --> bcpkix-jdk15on-${bouncycastle.version}.jar, <!-- Used by security-utils --> - bcprov-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, diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml index b2b18645bcd..c7f20d18a8a 100644 --- a/standalone-container/pom.xml +++ b/standalone-container/pom.xml @@ -103,10 +103,7 @@ 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 --> |