diff options
author | gjoranv <gv@verizonmedia.com> | 2021-09-24 10:58:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 10:58:59 +0200 |
commit | 9dabf1ce317325a334fd5f6aac531456acea17c4 (patch) | |
tree | 325b8a44e37383b2eb3251124abde9bd7ea50ba3 /container-disc | |
parent | f8cff5f259571ba1af41562ce5c9b0c999e14377 (diff) | |
parent | a1db80e7e1e2c339ef1334330c91df146b411db3 (diff) |
Merge pull request #19276 from vespa-engine/revert-19096-install-common-bundles-via-config-model
Revert "Install common bundles via config model [run-systemtest]" MERGEOK
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/pom.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index e3b2830a974..9b6ccd93a41 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -176,14 +176,12 @@ 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, - bcpkix-jdk15on-${bouncycastle.version}.jar, - bcprov-jdk15on-${bouncycastle.version}.jar, - - <!-- Jetty --> + 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 --> alpn-api-${jetty-alpn.version}.jar, http2-server-${jetty.version}.jar, http2-common-${jetty.version}.jar, @@ -200,8 +198,6 @@ 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, @@ -210,7 +206,10 @@ 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, |