Skip to content

Commit ab540c5

Browse files
committed
Re-introduce jetty servlet upgrades, the error was due to jakarta-servlet-api upgrade, not jetty, reverted jakarta-servlet-api back to 5.0.0 from 6.1.0 for Java 11 unsupported.
1 parent 89f15d0 commit ab540c5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ guava-testlib = "com.google.guava:guava-testlib:33.1.0-android"
5151
guava-jre = "com.google.guava:guava:33.3.1-jre"
5252
hdrhistogram = "org.hdrhistogram:HdrHistogram:2.2.2"
5353
# 6.0.0+ use java.lang.Deprecated forRemoval and since from Java 9
54-
jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.1.0"
54+
jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:5.0.0"
5555
# Not using the relocated org.apache.tomcat:tomcat-annotations-api because it requires migrating
5656
# java.annotation to jakarta.annotation. According to
5757
# https://github.com/grpc/grpc-java/issues/6833#issuecomment-602242609
@@ -60,9 +60,9 @@ javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
6060
javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
6161
# 12.0.0+ require Java 17+
6262
jetty-client = "org.eclipse.jetty:jetty-client:11.0.24"
63-
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.24"
63+
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.0.16"
6464
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
65-
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.24"
65+
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.16"
6666
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
6767
# 4.9.0+ requires Java 11.
6868
jsr305 = "com.github.spotbugs:spotbugs-annotations:4.8.6"

servlet/jakarta/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ 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.http2.parser', 'org.eclipse.jetty.http2')
54+
.replace('org.eclipse.jetty.servlet', 'org.eclipse.jetty.ee10.servlet')
5355
}
5456
}
5557
}

0 commit comments

Comments
 (0)