diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-09-27 23:00:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 23:00:59 +0200 |
| commit | 037f756caf4cfb99bcd988174839d7bc385267b9 (patch) | |
| tree | dbacdd333b8c9b3fc5662b0da8f737d8110bcc7c /container-disc | |
| parent | 990421550d364fda626b4ba3e4c16730f38c74ae (diff) | |
| parent | b5286c811ada6d1aacce5498b7e9fbdff6d33576 (diff) | |
Merge pull request #19277 from vespa-engine/revert-19276-revert-19096-install-common-bundles-via-config-model
Reapply "Install common bundles via config model"
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/pom.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 9b6ccd93a41..e3b2830a974 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -176,12 +176,14 @@ jdisc-security-filters-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 --> + + <!-- Vespa security utils with necessary 3rd party bundles --> security-utils-jar-with-dependencies.jar, - zkfacade-jar-with-dependencies.jar, - zookeeper-server-jar-with-dependencies.jar, - <!-- Apache http client repackaged as bundle --> - container-apache-http-client-bundle-jar-with-dependencies.jar, - <!-- Jetty --> + bcpkix-jdk15on-${bouncycastle.version}.jar, + bcprov-jdk15on-${bouncycastle.version}.jar, + + <!-- Jetty --> alpn-api-${jetty-alpn.version}.jar, http2-server-${jetty.version}.jar, http2-common-${jetty.version}.jar, @@ -198,6 +200,8 @@ jetty-servlets-${jetty.version}.jar, jetty-util-${jetty.version}.jar, jetty-util-ajax-${jetty.version}.jar, + javax.servlet-api-3.1.0.jar, + <!-- Spifly (required for OSGi service loader used by Jetty) --> org.apache.aries.spifly.dynamic.bundle-${spifly.version}.jar, asm-${asm.version}.jar, @@ -206,10 +210,7 @@ asm-tree-${asm.version}.jar, asm-util-${asm.version}.jar, <!-- Spifly end --> - <!-- Misc 3rd party bundles --> - bcpkix-jdk15on-${bouncycastle.version}.jar, - bcprov-jdk15on-${bouncycastle.version}.jar, - javax.servlet-api-3.1.0.jar, + <!-- Jersey 2 + Jackson 2 --> aopalliance-repackaged-${hk2.version}.jar, hk2-api-${hk2.version}.jar, |