summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-07-21 14:13:33 +0200
committergjoranv <gv@verizonmedia.com>2022-07-21 14:13:33 +0200
commit8513b31a4b8dfe5db185378147124a937ff488fd (patch)
tree696db9561e4f46dc1761d0efcd02e325be839bcc /container-disc
parent37b82350dd673de1d7375c01838123bf0b1e1a91 (diff)
Set up more bundles via config-model.
- These 4 bundles are currently required by all container cluster types, including standalone-containers.
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/pom.xml19
1 files changed, 5 insertions, 14 deletions
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,