From c04a03d9583d9552138304a6f6d7c51e5ba7f21c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 8 Jul 2026 11:13:01 +0200
Subject: [PATCH 1/2] FELIX-6848 - Update embedded Jetty to 12.1.11 (was
 12.1.10)

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 http/jetty12/CHANGELOG.MD                                       | 1 +
 http/jetty12/pom.xml                                            | 2 +-
 .../apache/felix/http/jetty/it/AbstractJettyTestSupport.java    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/http/jetty12/CHANGELOG.MD b/http/jetty12/CHANGELOG.MD
index 1417d3f994..866f584727 100644
--- a/http/jetty12/CHANGELOG.MD
+++ b/http/jetty12/CHANGELOG.MD
@@ -10,6 +10,7 @@ All notable changes to the `org.apache.felix.http.jetty12` bundle are documented
 
 ### Changed
 
+- Updated embedded Jetty to **12.1.11** (was 12.1.10). ([FELIX-6848](https://issues.apache.org/jira/browse/FELIX-6848))
 - Updated embedded Jetty to **12.1.10** (was 12.1.9). ([FELIX-6834](https://issues.apache.org/jira/browse/FELIX-6834))
 - Migrated from the deprecated `org.eclipse.jetty.server.handler.gzip.GzipHandler` to `CompressionHandler` + `GzipCompression` + `CompressionConfig` (Jetty 12.1 compression API). All include/exclude lists (methods, paths, mime types), min compress size, and sync flush are preserved. ([FELIX-6832](https://issues.apache.org/jira/browse/FELIX-6832))
 - Replaced deprecated `VirtualThreadPool.setMaxThreads` / `getMaxThreads` with `setMaxConcurrentTasks` / `getMaxConcurrentTasks`. ([FELIX-6832](https://issues.apache.org/jira/browse/FELIX-6832))
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 7e9a0c27d0..d1d5fd0813 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -42,7 +42,7 @@
 
     <properties>
         <felix.java.version>17</felix.java.version>
-        <jetty.version>12.1.10</jetty.version>
+        <jetty.version>12.1.11</jetty.version>
         <baseline.skip>true</baseline.skip>
         <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
         <!-- To debug the pax process, override this with -D -->
diff --git a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 81dc088ff7..dcbcf0480e 100644
--- a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -43,7 +43,7 @@
 import org.ops4j.pax.exam.util.PathUtils;
 
 public abstract class AbstractJettyTestSupport {
-    protected static final String JETTY_VERSION = "12.1.10";
+    protected static final String JETTY_VERSION = "12.1.11";
 
     private final String workingDirectory = String.format("%s/target/paxexam/%s/%s", PathUtils.getBaseDir(), getClass().getSimpleName(), UUID.randomUUID());
 

From 324a4aefd84a83032d9245772b6f5328c26eeab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Wed, 8 Jul 2026 11:15:50 +0200
Subject: [PATCH 2/2] FELIX-6848 - Update remaining Jetty 12.1.10 references to
 12.1.11

http/base and http/samples/whiteboard also pin a Jetty test/runtime
dependency version directly, matching what previous Jetty 12 upgrades
(e.g. FELIX-6834) updated alongside http/jetty12.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 http/base/pom.xml               | 2 +-
 http/samples/whiteboard/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/http/base/pom.xml b/http/base/pom.xml
index 53ac6be716..152ddfcca1 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>org.eclipse.jetty.ee11.websocket</groupId>
             <artifactId>jetty-ee11-websocket-jetty-server</artifactId>
-            <version>12.1.10</version>
+            <version>12.1.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index ae851567a7..7133492176 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -39,7 +39,7 @@
     </scm>
 
     <properties>
-        <jetty.version>12.1.10</jetty.version>
+        <jetty.version>12.1.11</jetty.version>
     </properties>
 
     <build>