diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-10-31 14:47:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-31 14:47:16 +0100 |
commit | 46c91950c5201f9b6b5d0a900dd41db615f05512 (patch) | |
tree | 3ba1ca5180e565437d4075429978594196aa5e97 /parent | |
parent | 51165321fc853278af72c6ca403bb0421bf206cc (diff) | |
parent | 097923307e80929f43271ebba27bb5ef52218e5c (diff) |
Merge pull request #24652 from vespa-engine/revert-24649-bjorncs/jetty
Revert "Upgrade Jetty from 9.4.49 to 11.0.12"
Diffstat (limited to 'parent')
-rw-r--r-- | parent/pom.xml | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index 37ef50fb386..fca6d9758fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -821,9 +821,9 @@ <version>${eclipse-collections.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty.http2</groupId> - <artifactId>http2-common</artifactId> - <version>${jetty.version}</version> + <groupId>org.eclipse.jetty.alpn</groupId> + <artifactId>alpn-api</artifactId> + <version>${jetty-alpn.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> @@ -837,37 +837,32 @@ </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-http</artifactId> + <artifactId>jetty-continuation</artifactId> <version>${jetty.version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</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> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> + <artifactId>jetty-servlets</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> @@ -876,11 +871,6 @@ <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 --> @@ -1043,8 +1033,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>11.0.12</jetty.version> - <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version> + <jetty.version>9.4.49.v20220914</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <jna.version>5.11.0</jna.version> <junit.version>5.8.1</junit.version> <maven-archiver.version>3.5.2</maven-archiver.version> |