[felix-dev] branch master updated: FELIX-6487 : Update to Jetty 11

[cziegeler]

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 458403a  FELIX-6487 : Update to Jetty 11
458403a is described below

commit 458403aed18009a600eba80ef3b882fc2e516549
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Mar 17 08:58:11 2022 +0100

    FELIX-6487 : Update to Jetty 11
---
 .../felix/http/base/internal/whiteboard/WhiteboardManager.java      | 6 +++---
 http/jetty/pom.xml                                                  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
 
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
index 7a839e9..f5a62be 100644
--- 
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
+++ 
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/WhiteboardManager.java
@@ -231,10 +231,10 @@ public final class WhiteboardManager
                         // nothing to do
                     }
                 }, props);
-        addTracker(new FilterTracker(this.httpBundleContext, this));
-        addTracker(new ListenersTracker(this.httpBundleContext, this));
+//        addTracker(new FilterTracker(this.httpBundleContext, this));
+//        addTracker(new ListenersTracker(this.httpBundleContext, this));
         addTracker(new PreprocessorTracker(this.httpBundleContext, this));
-        addTracker(new ServletTracker(this.httpBundleContext, this));
+//        addTracker(new ServletTracker(this.httpBundleContext, this));
         addTracker(new ResourceTracker(this.httpBundleContext, this));
         addTracker(new ServletContextHelperTracker(this.httpBundleContext, 
this));
         addTracker(new JavaxServletContextHelperTracker(httpBundleContext, 
this));
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 3517c96..29b3183 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -201,8 +201,10 @@
                         <Provide-Capability>
                             
osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1";
                             
uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard",
+<!--                            
                             
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.servlet.whiteboard.runtime.HttpServiceRuntime";
                             
uses:="org.osgi.service.servlet.whiteboard.runtime,org.osgi.service.servlet.whiteboard.runtime.dto",
+-->
                             
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.http.runtime.HttpServiceRuntime";
                             
uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto",
                             
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.http.HttpService";
@@ -272,8 +274,10 @@
                                 <Provide-Capability>
                                     
osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1";
                                     
uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard",
+<!--
                                     
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.servlet.whiteboard.runtime.HttpServiceRuntime";
                                     
uses:="org.osgi.service.servlet.whiteboard.runtime,org.osgi.service.servlet.whiteboard.runtime.dto",
+-->
                                     
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.http.runtime.HttpServiceRuntime";
                                     
uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto",
                                     
osgi.service;objectClass:List&lt;String&gt;="org.osgi.service.http.HttpService";