You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2026/08/24 07:38:23 UTC

(felix-dev) 01/01: FELIX-6856 Update to Jetty 12.1.12

This is an automated email from the ASF dual-hosted git repository.

paulrutter pushed a commit to branch maintenance/FELIX-6856-Jetty-12.1.12
in repository https://gitbox.apache.org/repos/asf/felix-dev.git

commit 9a19c6fe3168ff46d80552d29cc1aa6eb9680cec
Author: Paul Rütter <pa...@blueconic.com>
AuthorDate: Mon Aug 24 09:37:49 2026 +0200

    FELIX-6856 Update to Jetty 12.1.12
    
    Bump the embedded Jetty in the jetty12 bundle from 12.1.11 to 12.1.12.
    http/base and http/samples/whiteboard also pin a Jetty test/runtime
    dependency version directly, matching what previous Jetty 12 upgrades
    (e.g. FELIX-6848) updated alongside http/jetty12.
    
    Co-Authored-By: Claude Opus 4.8 <no...@anthropic.com>
---
 http/base/pom.xml                                                       | 2 +-
 http/jetty12/CHANGELOG.MD                                               | 1 +
 http/jetty12/pom.xml                                                    | 2 +-
 .../java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java   | 2 +-
 http/samples/whiteboard/pom.xml                                         | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/http/base/pom.xml b/http/base/pom.xml
index 1f17525dbc..dd68827e36 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.11</version>
+            <version>12.1.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/http/jetty12/CHANGELOG.MD b/http/jetty12/CHANGELOG.MD
index 866f584727..2d879d9433 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.12** (was 12.1.11). ([FELIX-6856](https://issues.apache.org/jira/browse/FELIX-6856))
 - 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))
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index f17fdec152..c75abe57cd 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.11</jetty.version>
+        <jetty.version>12.1.12</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 dcbcf0480e..b723a59240 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.options.extra.VMOption;
 import org.ops4j.pax.exam.util.PathUtils;
 
 public abstract class AbstractJettyTestSupport {
-    protected static final String JETTY_VERSION = "12.1.11";
+    protected static final String JETTY_VERSION = "12.1.12";
 
     private final String workingDirectory = String.format("%s/target/paxexam/%s/%s", PathUtils.getBaseDir(), getClass().getSimpleName(), UUID.randomUUID());
 
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index 7133492176..6b9b7da06d 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -39,7 +39,7 @@
     </scm>
 
     <properties>
-        <jetty.version>12.1.11</jetty.version>
+        <jetty.version>12.1.12</jetty.version>
     </properties>
 
     <build>