Merge branch 'master' into feature/FELIX-6750-Jetty-12.1.0-tryout

# Conflicts: # http/itest/pom.xml # http/jetty/pom.xml # http/jetty12/pom.xml # http/samples/whiteboard/pom.xml
apache · Jan 22, 2025 · 7a85962 · 7a85962
2 parents 7bca9f8 + 88d7173
commit 7a85962
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <felix.java.version>11</felix.java.version>
         <http.servlet.api.version>2.1.0</http.servlet.api.version>
-        <http.jetty.version>5.1.27-SNAPSHOT</http.jetty.version>
+        <http.jetty.version>5.1.29-SNAPSHOT</http.jetty.version>
         <http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
         <pax.exam.version>4.13.1</pax.exam.version>
         <pax.url.aether.version>2.6.14</pax.url.aether.version>