diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-03 14:05:46 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-08 13:41:36 +0200 |
| commit | ab58d331f5bc6626da507c4349e606d4886f1134 (patch) | |
| tree | 2f9d44ae3a7dc6070e472d0ec5976f2caa533cec /container-disc | |
| parent | 14ceb2e5596a30d63a0ae3ea6262f2f41bed93e7 (diff) | |
Embed the core Jetty bundles inside container-core
Diffstat (limited to 'container-disc')
| -rw-r--r-- | container-disc/pom.xml | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/container-disc/pom.xml b/container-disc/pom.xml index ad6092ad05a..283d33964df 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -217,23 +217,6 @@ <!-- 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! --> - alpn-api-${jetty-alpn.version}.jar, - http2-server-${jetty.version}.jar, - http2-common-${jetty.version}.jar, - http2-hpack-${jetty.version}.jar, - jetty-alpn-java-server-${jetty.version}.jar, - jetty-alpn-server-${jetty.version}.jar, - jetty-client-${jetty.version}.jar, - 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, javax.servlet-api-3.1.0.jar, <!-- Spifly (required for OSGi service loader used by Jetty) --> @@ -255,6 +238,10 @@ <!-- Only one instance of javax.ws.rs.client.ClientBuilder can be loaded by the JVM --> javax.ws.rs-api-${javax.ws.rs-api.version}.jar </discPreInstallBundle> + + <!-- Enable Spifly ServiceLoader weaving. Required for Jetty ALPN/HTTP2 --> + <SPI-Provider>*</SPI-Provider> + <SPI-Consumer>*</SPI-Consumer> </configuration> </plugin> <plugin> |