diff options
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 7 | ||||
| -rw-r--r-- | container-dependency-versions/pom.xml | 20 | ||||
| -rw-r--r-- | container-disc/pom.xml | 6 | ||||
| -rw-r--r-- | jdisc_jetty/pom.xml | 12 |
4 files changed, 45 insertions, 0 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8a504635f25..25350957a34 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -31,6 +31,7 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.38.v20210224</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <junit5.version>5.7.0</junit5.version> <junit5.platform.version>1.7.0</junit5.platform.version> <org.lz4.version>1.7.1</org.lz4.version> @@ -253,6 +254,12 @@ <include>org.apache.opennlp:opennlp-tools:1.8.4:jar:test</include> <include>org.apiguardian:apiguardian-api:1.1.0:jar:test</include> <include>org.codehaus.woodstox:stax2-api:3.1.4:jar:test</include> + <include>org.eclipse.jetty.alpn:alpn-api:[${jetty-alpn.version}]:jar:test</include> + <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty.http2:http2-server:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-alpn-server:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-alpn-java-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-continuation:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-jmx:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-security:[${jetty.version}]:jar:test</include> diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index 04ce3405d83..afcdf474723 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -387,6 +387,25 @@ <artifactId>guava-testlib</artifactId> <version>${guava.version}</version> </dependency> + + <dependency> + <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users --> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + <version>${jetty-alpn.version}</version> + </dependency> + <dependency> + <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users --> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users --> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-java-server</artifactId> + <version>${jetty.version}</version> + </dependency> <dependency> <!-- Installed in jdisc runtime, but should only be used internally and not leaked as maven dep to users --> <groupId>org.eclipse.jetty</groupId> @@ -459,6 +478,7 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <jaxb.version>2.3.0</jaxb.version> <jetty.version>9.4.38.v20210224</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.lz4.version>1.7.1</org.lz4.version> <org.json.version>20090211</org.json.version> <slf4j.version>1.7.30</slf4j.version> diff --git a/container-disc/pom.xml b/container-disc/pom.xml index a78657b7f09..15eb0328284 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -188,6 +188,12 @@ zkfacade-jar-with-dependencies.jar, zookeeper-server-jar-with-dependencies.jar, <!-- Jetty --> + 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-continuation-${jetty.version}.jar, jetty-http-${jetty.version}.jar, jetty-io-${jetty.version}.jar, diff --git a/jdisc_jetty/pom.xml b/jdisc_jetty/pom.xml index 89e573651e9..fcbf0eed8b7 100644 --- a/jdisc_jetty/pom.xml +++ b/jdisc_jetty/pom.xml @@ -16,6 +16,18 @@ <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-continuation</artifactId> </dependency> |