diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-10-27 10:41:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 10:41:16 +0200 |
| commit | abe8f597b50d5fcfb379c136abc6462044f90e0c (patch) | |
| tree | 5ccfbdb18b33599a8c4ddb15245e60ba36b445c6 /parent | |
| parent | 1b15163ee4186abf57729a07c8946415bc0086d4 (diff) | |
| parent | 439b1242e595f0cd60ed8f6e1fab48c6bb40fdfa (diff) | |
Merge pull request #24565 from vespa-engine/bjorncs/jetty
Upgrade Jetty from 9.4.49 to 11.0.12 [run-systemtest]
Diffstat (limited to 'parent')
| -rw-r--r-- | parent/pom.xml | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 62d57660bcf..068dc5579b2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -821,9 +821,9 @@ <version>${eclipse-collections.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.alpn</groupId> - <artifactId>alpn-api</artifactId> - <version>${jetty-alpn.version}</version> + <groupId>org.eclipse.jetty.http2</groupId> + <artifactId>http2-common</artifactId> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> @@ -837,32 +837,37 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-alpn-server</artifactId> + <version>${jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> + <artifactId>jetty-http</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> + <artifactId>jetty-io</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> + <artifactId>jetty-jmx</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> + <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jmx</artifactId> + <artifactId>jetty-servlet</artifactId> <version>${jetty.version}</version> </dependency> <dependency> @@ -871,6 +876,11 @@ <version>${jetty.version}</version> </dependency> <dependency> + <groupId>org.eclipse.jetty.toolchain</groupId> + <artifactId>jetty-jakarta-servlet-api</artifactId> + <version>${jetty-servlet-api.version}</version> + </dependency> + <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> <version>2.3.2</version> <!-- 2.3.3 has a BROKEN manifest --> @@ -1033,8 +1043,8 @@ <felix.log.version>1.0.1</felix.log.version> <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava --> <hdrhistogram.version>2.1.12</hdrhistogram.version> - <jetty.version>9.4.49.v20220914</jetty.version> - <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> + <jetty.version>11.0.12</jetty.version> + <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version> <jna.version>5.11.0</jna.version> <junit.version>5.8.1</junit.version> <maven-archiver.version>3.5.2</maven-archiver.version> |