You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2024/09/06 12:41:09 UTC
(felix-dev) branch master updated: FELIX-6725 Update to Jetty 12.0.13 / 11.0.24 (#333)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new f6bba2fa1a FELIX-6725 Update to Jetty 12.0.13 / 11.0.24 (#333)
f6bba2fa1a is described below
commit f6bba2fa1a4dbec4dc031222620d718452e6b8ea
Author: Paul <pa...@blueconic.com>
AuthorDate: Fri Sep 6 14:41:03 2024 +0200
FELIX-6725 Update to Jetty 12.0.13 / 11.0.24 (#333)
- Upgrade Jetty 11 and 12 to latest
---
http/jetty/pom.xml | 2 +-
.../java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java | 2 +-
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(+), 5 deletions(-)
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 33c8b9fcb0..3626dc4b4c 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.23</jetty.version>
+ <jetty.version>11.0.24</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 2c3ae452dc..849677c8c1 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.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractJettyTestSupport {
- protected static final String JETTY_VERSION = "11.0.23";
+ protected static final String JETTY_VERSION = "11.0.24";
protected final Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index fda0f926bf..5f4be7adc5 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.12</jetty.version>
+ <jetty.version>12.0.13</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 028d7caeea..51d7792f08 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.Logger;
import org.slf4j.LoggerFactory;
public abstract class AbstractJettyTestSupport {
- protected static final String JETTY_VERSION = "12.0.12";
+ protected static final String JETTY_VERSION = "12.0.13";
protected final Logger logger = LoggerFactory.getLogger(getClass());
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index aa1fd8f3ee..2b4b761841 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -39,7 +39,7 @@
</scm>
<properties>
- <jetty.version>12.0.12</jetty.version>
+ <jetty.version>12.0.13</jetty.version>
</properties>
<build>