aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-06-07 16:26:34 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2022-06-08 13:44:26 +0200
commit2af24a81aa7c2351e6e2a7dd22419dd65b0be79b (patch)
treea1e107b7d680f09047f474c3aecf446d8c94241c /container-disc
parent5b69de35fb321ccd52757f4dac75df52f1c711d8 (diff)
Package spifly and asm dependencies into container-spifly bundle
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/pom.xml16
1 files changed, 5 insertions, 11 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index 283d33964df..569241c0986 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -207,27 +207,21 @@
linguistics-components-jar-with-dependencies.jar,
vespaclient-container-plugin-jar-with-dependencies.jar,
vespa-athenz-jar-with-dependencies.jar,
- container-apache-http-client-bundle-jar-with-dependencies.jar, <!-- Apache http client repackaged as bundle -->
+
+ <!-- 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,
- <!-- Jetty -->
<!-- TODO Vespa 8: embed these in container-core/disc, saving a lot of dep management. -->
<!-- Check if those listed in container-dep-versions are not used by hosted apps! -->
javax.servlet-api-3.1.0.jar,
- <!-- Spifly (required for OSGi service loader used by Jetty) -->
- <!-- TODO: embed these in container-core/disc, not used across bundles -->
- org.apache.aries.spifly.dynamic.bundle-${spifly.version}.jar,
- asm-${asm.version}.jar,
- asm-analysis-${asm.version}.jar,
- asm-commons-${asm.version}.jar,
- asm-tree-${asm.version}.jar,
- asm-util-${asm.version}.jar,
- <!-- Spifly end -->
+ <!-- Aries SPIFly repackaged -->
+ container-spifly.jar,
jackson-annotations-${jackson2.version}.jar,
jackson-core-${jackson2.version}.jar,