summaryrefslogtreecommitdiffstats
path: root/parent
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2022-10-31 12:06:09 +0100
committerGitHub <noreply@github.com>2022-10-31 12:06:09 +0100
commit097923307e80929f43271ebba27bb5ef52218e5c (patch)
tree1e1298fe68e5a9d67bcc493ec5148eeebc58fb85 /parent
parent5c7c221d98120c0eaf826f06c2a24bd305024ae6 (diff)
Revert "Upgrade Jetty from 9.4.49 to 11.0.12"
Diffstat (limited to 'parent')
-rw-r--r--parent/pom.xml30
1 files changed, 10 insertions, 20 deletions
diff --git a/parent/pom.xml b/parent/pom.xml
index 068dc5579b2..62d57660bcf 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>