diff options
-rw-r--r-- | application/pom.xml | 45 | ||||
-rw-r--r-- | container-core/pom.xml | 39 | ||||
-rw-r--r-- | container-dev/pom.xml | 39 | ||||
-rw-r--r-- | container-disc/pom.xml | 21 | ||||
-rw-r--r-- | container-test/pom.xml | 39 | ||||
-rw-r--r-- | dist/vespa.spec | 3 | ||||
-rw-r--r-- | jdisc_jetty/pom.xml | 36 |
7 files changed, 166 insertions, 56 deletions
diff --git a/application/pom.xml b/application/pom.xml index b0036b3ca3e..6fbd2a5867b 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -142,6 +142,51 @@ <scope>test</scope> </dependency> + <!-- START JETTY embedded jars --> + <dependency> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-java-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <scope>test</scope> + </dependency> + <!-- END JETTY embedded jars --> + </dependencies> <build> diff --git a/container-core/pom.xml b/container-core/pom.xml index 2689d2794b3..57b984e7635 100644 --- a/container-core/pom.xml +++ b/container-core/pom.xml @@ -112,6 +112,45 @@ <artifactId>HdrHistogram</artifactId> </dependency> + <!-- START JETTY embedded jars --> + <dependency> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-java-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + </dependency> + <!-- END JETTY embedded jars --> + <!-- PROVIDED scope --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 346371e0477..715340c4913 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -102,6 +102,45 @@ <groupId>org.hdrhistogram</groupId> <artifactId>HdrHistogram</artifactId> </exclusion> + + <!-- START JETTY embedded jars --> + <exclusion> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-java-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + </exclusion> + <!-- END JETTY embedded jars --> </exclusions> </dependency> <dependency> 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> diff --git a/container-test/pom.xml b/container-test/pom.xml index 91519da6dd3..a938329dd72 100644 --- a/container-test/pom.xml +++ b/container-test/pom.xml @@ -116,5 +116,44 @@ <groupId>org.lz4</groupId> <artifactId>lz4-java</artifactId> </dependency> + + <!-- START JETTY embedded jars --> + <dependency> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-java-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-client</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-continuation</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jmx</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + </dependency> + <!-- END JETTY embedded jars --> </dependencies> </project> diff --git a/dist/vespa.spec b/dist/vespa.spec index d43e6caa1ff..42c63b00abd 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -918,9 +918,6 @@ fi %{_prefix}/lib/jars/jdisc_core-jar-with-dependencies.jar %{_prefix}/lib/jars/jdisc-security-filters-jar-with-dependencies.jar %{_prefix}/lib/jars/linguistics-components-jar-with-dependencies.jar -%{_prefix}/lib/jars/alpn-*.jar -%{_prefix}/lib/jars/http2-*.jar -%{_prefix}/lib/jars/jetty-*.jar %{_prefix}/lib/jars/model-evaluation-jar-with-dependencies.jar %{_prefix}/lib/jars/model-integration-jar-with-dependencies.jar %{_prefix}/lib/jars/org.apache.aries.spifly.dynamic.bundle-*.jar diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index dc3976098fa..375958550f2 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -16,42 +16,6 @@ <packaging>jar</packaging> <dependencies> <dependency> - <groupId>org.eclipse.jetty.alpn</groupId> - <artifactId>alpn-api</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.http2</groupId> - <artifactId>http2-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-alpn-java-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-client</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> - </dependency> - <dependency> <!-- Required for ServiceLoader to function in OSGi environment. ServiceLoader is used by Jetty --> <groupId>org.apache.aries.spifly</groupId> <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> |