Skip to content

Commit 1417894

Browse files
committed
Revert jakarta version upgrades, since it fails build about Java 11 compiled class files: https://github.com/grpc/grpc-java/actions/runs/13116274751/job/36591256364?pr=11874
1 parent dc2d2b1 commit 1417894

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ javax-annotation = "org.apache.tomcat:annotations-api:6.0.53"
5959
javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
6060
# 12.0.0+ require Java 17+
6161
jetty-client = "org.eclipse.jetty:jetty-client:11.0.24"
62-
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.0.16"
62+
jetty-http2-server = "org.eclipse.jetty.http2:http2-server:11.0.24"
6363
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.20"
64-
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.16"
64+
jetty-servlet = "org.eclipse.jetty:jetty-servlet:11.0.24"
6565
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.20"
6666
# 4.9.0+ requires Java 11.
6767
jsr305 = "com.github.spotbugs:spotbugs-annotations:4.8.6"

servlet/jakarta/build.gradle

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

0 commit comments

Comments
 (0)