Update Jetty to 10.0.19 and servlet-api to 4.0.4

Adapt JettyServer to Jetty refactoring jetty/jetty.project#4777 Bug: Issue 317770594 Release-Notes: Update Jetty to 10.0.19 and servlet-api to 4.0.4 Change-Id: I6faa8b8e13b1525120db79b27ff2a72bf8c5f865
GerritCodeReview · Jan 15, 2024 · df478a3 · df478a3
1 parent 854d5d4
commit df478a3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/java/com/google/gerrit/pgm/http/jetty/JettyServer.java
@@ -51,6 +51,7 @@
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
 import org.eclipse.jetty.http.HttpScheme;
+import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.io.ConnectionStatistics;
 import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.Connector;
@@ -373,7 +374,7 @@ private Connector[] listen(Server server, Config cfg) {
         config.addCustomizer(new ForwardedRequestCustomizer());
         config.addCustomizer(
             (connector, channelConfig, request) -> {
-              request.setScheme(HttpScheme.HTTPS.asString());
+              request.setHttpURI(HttpURI.build(request.getHttpURI()).scheme(HttpScheme.HTTPS));
               request.setSecure(true);
             });
         c = newServerConnector(server, acceptors, config);

diff --git a/tools/deps.bzl b/tools/deps.bzl
@@ -23,7 +23,7 @@ GITILES_REPO = GERRIT
 # When updating Bouncy Castle, also update it in bazlets.
 BC_VERS = "1.77"
 HTTPCOMP_VERS = "4.5.14"
-JETTY_VERS = "9.4.53.v20231009"
+JETTY_VERS = "10.0.19"
 BYTE_BUDDY_VERSION = "1.14.9"
 ROARING_BITMAP_VERSION = "0.9.44"
 
@@ -70,8 +70,8 @@ def java_dependencies():
 
     maven_jar(
         name = "servlet-api",
-        artifact = "javax.servlet:javax.servlet-api:3.1.0",
-        sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
+        artifact = "jakarta.servlet:jakarta.servlet-api:4.0.4",
+        sha1 = "b8a1142e04838fe54194049c6e7a18dae8f9b960",
     )
 
     maven_jar(
@@ -489,50 +489,49 @@ def java_dependencies():
     maven_jar(
         name = "jetty-servlet",
         artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
-        sha1 = "6670d6a54cdcaedd8090e8cf420fd5dd7d08e859",
+        sha1 = "c223bf2636827b3a97493894c250d29964e9b30f",
     )
 
     maven_jar(
         name = "jetty-security",
         artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
-        sha1 = "6fbc8ebe9046954dc2f51d4ba69c8f8344b05f7f",
+        sha1 = "21732e19ac8bca003e394de61b285f3e9a4c7412",
     )
 
     maven_jar(
         name = "jetty-server",
         artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
-        sha1 = "8b0e761a0b359db59dae77c00b4213b0586cb994",
+        sha1 = "5a0f3f4118cd80cbdfa38f162e1ccd50afc8cae6",
     )
 
     maven_jar(
         name = "jetty-jmx",
         artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
-        sha1 = "f0392f756b59f65ea7d6be41bf7a2f7b2c7c98d5",
+        sha1 = "2de72c66cdc41d8fcbc255ce734d3871c40d36d6",
     )
 
     maven_jar(
         name = "jetty-http",
         artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
-        sha1 = "87faf21eb322753f0527bcb88c43e67044786369",
+        sha1 = "4f51263a15a9879a6e06f3804cdaaddc1ef3f5a6",
     )
 
     maven_jar(
         name = "jetty-io",
         artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
-        sha1 = "70cf7649b27c964ad29bfddf58f3bfe0d30346cf",
+        sha1 = "1a08ba2c33c92d7d1f2a9dd8b87653c237756921",
     )
 
     maven_jar(
         name = "jetty-util",
         artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
-        sha1 = "f72bb4f687b4454052c6f06528ba9910714df947",
+        sha1 = "aef0b94fe37c6527406be19fe21c34c53bb165db",
     )
 
     maven_jar(
         name = "jetty-util-ajax",
         artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERS,
-        sha1 = "4d20f6206eb7747293697c5f64c2dc5bf4bd54a4",
-        src_sha1 = "1aed8017c3c8a449323901639de6b4eb3b1f02ea",
+        sha1 = "999d4e8855faab3b52afd214030bbc3367c1fa4c",
     )
 
     maven_jar(