From 2288032fd5c7ef57637388e2070a9f0333305515 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Date: Mon, 2 Feb 2026 12:10:46 +1100
Subject: [PATCH 1/2] Update Jetty versions to 12.0.32 and 12.1.6

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
---
 .../java/com/google/appengine/tools/info/Jetty121EE8Sdk.java  | 2 +-
 pom.xml                                                       | 4 ++--
 runtime/local_jetty121/pom.xml                                | 2 +-
 runtime/local_jetty121_ee11/pom.xml                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
index 393448b40..2f01f9567 100644
--- a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
+++ b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
@@ -233,7 +233,7 @@ List<File> getJetty121SharedLibFiles() {
     sharedLibs.add(new File(sdkRoot, "lib/shared/jetty12/appengine-local-runtime-shared.jar"));
     File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
 
-    sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.6.jar")); // this is javax.servlet
+    sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.8.jar")); // this is javax.servlet
 
     // We want to match this file: "jetty-util-9.3.8.v20160314.jar"
     // but without hardcoding the Jetty version which is changing from time to time.
diff --git a/pom.xml b/pom.xml
index 27f2a4e1e..562c0ca7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
     <maven.compiler.target>17</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.58.v20250814</jetty.version>
-    <jetty12.version>12.0.31</jetty12.version>
-    <jetty121.version>12.1.5</jetty121.version>
+    <jetty12.version>12.0.32</jetty12.version>
+    <jetty121.version>12.1.6</jetty121.version>
     <slf4j.version>2.0.17</slf4j.version>
     <protoc.version>4.33.4</protoc.version>
     <distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>
diff --git a/runtime/local_jetty121/pom.xml b/runtime/local_jetty121/pom.xml
index 56ef2385c..75760a965 100644
--- a/runtime/local_jetty121/pom.xml
+++ b/runtime/local_jetty121/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-servlet-api</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/runtime/local_jetty121_ee11/pom.xml b/runtime/local_jetty121_ee11/pom.xml
index 33cb17b55..dd3dd8217 100644
--- a/runtime/local_jetty121_ee11/pom.xml
+++ b/runtime/local_jetty121_ee11/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-servlet-api</artifactId>
-      <version>4.0.6</version>
+      <version>4.0.8</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

From a71d818516df735e10b45b9fa763f60475c52a2e Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Date: Mon, 2 Feb 2026 13:02:06 +1100
Subject: [PATCH 2/2] use jetty-servlet-api 4.0.9

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
---
 .../java/com/google/appengine/tools/info/Jetty121EE8Sdk.java    | 2 +-
 runtime/local_jetty121/pom.xml                                  | 2 +-
 runtime/local_jetty121_ee11/pom.xml                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
index 2f01f9567..a9b7a26a9 100644
--- a/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
+++ b/api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java
@@ -233,7 +233,7 @@ List<File> getJetty121SharedLibFiles() {
     sharedLibs.add(new File(sdkRoot, "lib/shared/jetty12/appengine-local-runtime-shared.jar"));
     File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
 
-    sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.8.jar")); // this is javax.servlet
+    sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.9.jar")); // this is javax.servlet
 
     // We want to match this file: "jetty-util-9.3.8.v20160314.jar"
     // but without hardcoding the Jetty version which is changing from time to time.
diff --git a/runtime/local_jetty121/pom.xml b/runtime/local_jetty121/pom.xml
index 75760a965..2fcceb0fb 100644
--- a/runtime/local_jetty121/pom.xml
+++ b/runtime/local_jetty121/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-servlet-api</artifactId>
-      <version>4.0.8</version>
+      <version>4.0.9</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/runtime/local_jetty121_ee11/pom.xml b/runtime/local_jetty121_ee11/pom.xml
index dd3dd8217..f8fb7ca4e 100644
--- a/runtime/local_jetty121_ee11/pom.xml
+++ b/runtime/local_jetty121_ee11/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-servlet-api</artifactId>
-      <version>4.0.8</version>
+      <version>4.0.9</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>