diff options
| author | gjoranv <gv@verizonmedia.com> | 2021-03-25 01:21:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 01:21:57 +0100 |
| commit | b8efc4785db0d3fef303b22e30e6f23e85ea4e51 (patch) | |
| tree | c78641c028428abb907baf03fac6eb163873d38a /container-disc/pom.xml | |
| parent | 17978ed4bc296f2bd27e00b35244a6b1da66f40d (diff) | |
| parent | 0176ecaec7b8beecacc0c27597b5f92d7db520f4 (diff) | |
Merge pull request #17140 from vespa-engine/gjoranv/merge-http-into-core_rebased
Gjoranv/merge http into core (rebased)
Diffstat (limited to 'container-disc/pom.xml')
| -rw-r--r-- | container-disc/pom.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index a5f678ad828..b8fbf5fae2a 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -178,6 +178,7 @@ <buildLegacyVespaPlatformBundle>true</buildLegacyVespaPlatformBundle> <discPreInstallBundle> <!-- Vespa bundles --> + component-jar-with-dependencies.jar, configgen.jar, config-bundle-jar-with-dependencies.jar, configdefinitions-jar-with-dependencies.jar, @@ -187,7 +188,6 @@ docprocs-jar-with-dependencies.jar, hosted-zone-api-jar-with-dependencies.jar, jdisc-security-filters-jar-with-dependencies.jar, - jdisc_http_service-jar-with-dependencies.jar, model-evaluation-jar-with-dependencies.jar, model-integration-jar-with-dependencies.jar, vespaclient-container-plugin-jar-with-dependencies.jar, @@ -198,9 +198,21 @@ component-jar-with-dependencies.jar, zkfacade-jar-with-dependencies.jar, zookeeper-server-jar-with-dependencies.jar, + <!-- Jetty --> + jetty-continuation-${jetty.version}.jar, + jetty-http-${jetty.version}.jar, + jetty-io-${jetty.version}.jar, + jetty-jmx-${jetty.version}.jar, + jetty-security-${jetty.version}.jar, + jetty-server-${jetty.version}.jar, + jetty-servlet-${jetty.version}.jar, + jetty-servlets-${jetty.version}.jar, + jetty-util-${jetty.version}.jar, + jetty-util-ajax-${jetty.version}.jar, <!-- 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, |