Skip to content

Commit 9278833

Browse files
committed
Undo jetty ee10 migration for now.
1 parent 659baf5 commit 9278833

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ jetty-client = "org.eclipse.jetty:jetty-client:11.0.24"
6262
# Relocated to jetty-http3-server that we don't use
6363
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.24"
6464
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
65-
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.16"
65+
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.24"
6666
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
67+
# 4.9.0+ requires Java 11.
6768
jsr305 = "com.github.spotbugs:spotbugs-annotations:4.8.6"
6869
junit = "junit:junit:4.13.2"
6970
# 2.17+ require Java 11+ (not mentioned in release notes)

servlet/jakarta/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ def migrate(String name, String inputDir, SourceSet sourceSet) {
5050
filter { String line ->
5151
line.replace('javax.servlet', 'jakarta.servlet')
5252
.replace('io.grpc.servlet', 'io.grpc.servlet.jakarta')
53-
.replace('org.eclipse.jetty.servlet', 'org.eclipse.jetty.ee10.servlet')
5453
}
5554
}
5655
}

0 commit comments

Comments
 (0)