(felix-dev) branch master updated: Revert "FELIX-6754-Update-jetty-to-12.0.17"

[paulrutter]

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

paulrutter 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 3ae694ae17 Revert "FELIX-6754-Update-jetty-to-12.0.17"
3ae694ae17 is described below

commit 3ae694ae174da8a5551c2641cc6fa899b62c7606
Author: Paul Rütter <p...@blueconic.com>
AuthorDate: Mon Mar 10 08:53:49 2025 +0100

    Revert "FELIX-6754-Update-jetty-to-12.0.17"
    
    This reverts commit 264bd75701284b923653f613b570e72f08af9824.
    
    JETTY_11 was mistakenly added to the list of enums that require setting 
`setDecodeAmbiguousURIs`. This commit reverts this behavior.
---
 .../main/java/org/apache/felix/http/jetty/internal/JettyService.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
 
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index 4639639cbc..efe4f8fb83 100644
--- 
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++ 
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -16,7 +16,6 @@
  */
 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;
@@ -717,8 +716,7 @@ public final class JettyService
                 UriCompliance compliance = 
UriCompliance.valueOf(uriComplianceMode);
                 config.setUriCompliance(compliance);
 
-                if (LEGACY.equals(compliance) || UNSAFE.equals(compliance) ||
-                        UNAMBIGUOUS.equals(compliance) || 
JETTY_11.equals(compliance)) {
+                if (LEGACY.equals(compliance) || UNSAFE.equals(compliance) || 
UNAMBIGUOUS.equals(compliance)) {
                     // See 
https://github.com/jetty/jetty.project/issues/11448#issuecomment-1969206031
                     this.server.getContainedBeans(ServletHandler.class)
                             .forEach(handler -> 
handler.setDecodeAmbiguousURIs(true));