Merge pull request #379 from apache/maintenance/FELIX-6754-Update-jetty-to-12.0.17

FELIX-6754 Update jetty to 12.0.17

Author: paulrutter

http/jetty12/pom.xml

@@ -42,7 +42,7 @@
 
     <properties>
         <felix.java.version>17</felix.java.version>
-        <jetty.version>12.0.16</jetty.version>
+        <jetty.version>12.0.17</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 -->

http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java

@@ -16,6 +16,7 @@
  */
 package org.apache.felix.http.jetty.internal;
 
+import static org.eclipse.jetty.http.UriCompliance.JETTY_11;
 import static org.eclipse.jetty.http.UriCompliance.LEGACY;
 import static org.eclipse.jetty.http.UriCompliance.UNAMBIGUOUS;
 import static org.eclipse.jetty.http.UriCompliance.UNSAFE;
@@ -716,7 +717,8 @@ private void configureHttpConnectionFactory(HttpConnectionFactory connFactory)
                 UriCompliance compliance = UriCompliance.valueOf(uriComplianceMode);
                 config.setUriCompliance(compliance);
 
-                if (LEGACY.equals(compliance) || UNSAFE.equals(compliance) || UNAMBIGUOUS.equals(compliance)) {
+                if (LEGACY.equals(compliance) || UNSAFE.equals(compliance) ||
+                        UNAMBIGUOUS.equals(compliance) || JETTY_11.equals(compliance)) {
                     // See https://github.com/jetty/jetty.project/issues/11448#issuecomment-1969206031
                     this.server.getContainedBeans(ServletHandler.class)
                             .forEach(handler -> handler.setDecodeAmbiguousURIs(true));

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.16";
+    protected static final String JETTY_VERSION = "12.0.17";
 
     protected final Logger logger = LoggerFactory.getLogger(getClass());
 

http/samples/whiteboard/pom.xml

@@ -39,7 +39,7 @@
     </scm>
 
     <properties>
-        <jetty.version>12.0.16</jetty.version>
+        <jetty.version>12.0.17</jetty.version>
     </properties>
 
     <build>