From f320aef5d16886cd1fac8ccd4fbc357d7d747896 Mon Sep 17 00:00:00 2001
From: Paul <paul@blueconic.com>
Date: Sat, 6 Jul 2024 14:58:34 +0200
Subject: [PATCH] FELIX-6716 Update to Jetty 11.0.22 / 12.0.11 (#326)

* FELIX-6716 Update to Jetty 11.0.22 / 12.0.11
- Upgrade Jetty in both bundles

* Update unit test
---
 http/jetty/pom.xml                                              | 2 +-
 .../apache/felix/http/jetty/it/AbstractJettyTestSupport.java    | 2 +-
 http/jetty12/pom.xml                                            | 2 +-
 .../apache/felix/http/jetty/it/AbstractJettyTestSupport.java    | 2 +-
 http/samples/whiteboard/pom.xml                                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 7c43eb5e90..01f73bcd82 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -42,7 +42,7 @@
 
     <properties>
         <felix.java.version>11</felix.java.version>
-        <jetty.version>11.0.21</jetty.version>
+        <jetty.version>11.0.22</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/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 27d00e0458..72f43a91a6 100644
--- a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++ b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -45,7 +45,7 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class AbstractJettyTestSupport {
-    protected static final String JETTY_VERSION = "11.0.20";
+    protected static final String JETTY_VERSION = "11.0.22";
 
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index a66b7053a2..42b6b508a0 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.0.10</jetty.version>
+        <jetty.version>12.0.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 01c3a1d6c8..52687c223b 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
@@ -45,7 +45,7 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class AbstractJettyTestSupport {
-    protected static final String JETTY_VERSION = "12.0.10";
+    protected static final String JETTY_VERSION = "12.0.11";
 
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index 724564ae3f..97ab22c3ec 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -39,7 +39,7 @@
     </scm>
 
     <properties>
-        <jetty.version>12.0.10</jetty.version>
+        <jetty.version>12.0.11</jetty.version>
     </properties>
 
     <build>