From fae479fed5a6478d19ad1b8a25538290f47a8d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20R=C3=BCtter?= Date: Tue, 8 Sep 2026 11:30:46 +0200 Subject: [PATCH] FELIX-6860 Update embedded Jetty to 12.1.13 Co-Authored-By: Claude Opus 5 --- http/base/pom.xml | 2 +- http/jetty12/CHANGELOG.MD | 1 + http/jetty12/pom.xml | 2 +- .../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 e22f4c42a5..7695361c22 100644 --- a/http/base/pom.xml +++ b/http/base/pom.xml @@ -155,7 +155,7 @@ org.eclipse.jetty.ee11.websocket jetty-ee11-websocket-jetty-server - 12.1.12 + 12.1.13 test diff --git a/http/jetty12/CHANGELOG.MD b/http/jetty12/CHANGELOG.MD index 2d879d9433..9e6699fcf7 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.13** (was 12.1.12). ([FELIX-6860](https://issues.apache.org/jira/browse/FELIX-6860)) - 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)) diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml index 4bc669802d..099c6f6d29 100644 --- a/http/jetty12/pom.xml +++ b/http/jetty12/pom.xml @@ -45,7 +45,7 @@ The optional virtual-threads support (felix.jetty.threadpool.useVirtualThreads) additionally requires Java 21 at runtime and is enabled conditionally (see JettyService). --> 17 - 12.1.12 + 12.1.13 2.0.17 false 4.13.3 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 b723a59240..de84df20b1 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.12"; + protected static final String JETTY_VERSION = "12.1.13"; 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 6b9b7da06d..4532961275 100644 --- a/http/samples/whiteboard/pom.xml +++ b/http/samples/whiteboard/pom.xml @@ -39,7 +39,7 @@ - 12.1.12 + 12.1.13