[felix-dev] branch master updated: FELIX-6631 : Migrate webconsole plugins to jakarta.servlet api

[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 a81cfcd152 FELIX-6631 : Migrate webconsole plugins to jakarta.servlet 
api
a81cfcd152 is described below

commit a81cfcd152ce444c8638d778c28216ab8f12e45a
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Aug 22 10:22:10 2023 +0200

    FELIX-6631 : Migrate webconsole plugins to jakarta.servlet api
---
 .../org/apache/felix/webconsole/plugins/obr/internal/Activator.java | 6 +++---
 .../plugins/obr/internal/FelixBundleRepositoryRenderHelper.java     | 1 -
 .../plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
index 3d0a52a6f6..3e94b5f79e 100644
--- 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
+++ 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/Activator.java
@@ -27,7 +27,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
 /**
  * Activator is the main starting class.
  */
-public class Activator implements BundleActivator, ServiceTrackerCustomizer, 
Constants
+public class Activator implements BundleActivator, ServiceTrackerCustomizer
 {
 
     private ServiceTracker tracker;
@@ -42,8 +42,8 @@ public class Activator implements BundleActivator, 
ServiceTrackerCustomizer, Con
     {
         this.context = context;
         Filter filter = context.createFilter("(|" //$NON-NLS-1$
-            + '(' + OBJECTCLASS + "=org.osgi.service.obr.RepositoryAdmin)" 
//$NON-NLS-1$
-            + '(' + OBJECTCLASS + 
"=org.apache.felix.bundlerepository.RepositoryAdmin)" //$NON-NLS-1$
+            + '(' + Constants.OBJECTCLASS + 
"=org.osgi.service.obr.RepositoryAdmin)" //$NON-NLS-1$
+            + '(' + Constants.OBJECTCLASS + 
"=org.apache.felix.bundlerepository.RepositoryAdmin)" //$NON-NLS-1$
             + ')');
         this.tracker = new ServiceTracker(context, filter, this);
         this.tracker.open();
diff --git 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
index b54317b236..b6057902b1 100644
--- 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
+++ 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/FelixBundleRepositoryRenderHelper.java
@@ -33,7 +33,6 @@ import org.apache.felix.bundlerepository.Requirement;
 import org.apache.felix.bundlerepository.Resolver;
 import org.apache.felix.bundlerepository.Resource;
 import org.apache.felix.utils.json.JSONWriter;
-import org.apache.felix.webconsole.servlet.AbstractServlet;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
diff --git 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
index 290bf5ff41..c244414602 100644
--- 
a/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
+++ 
b/webconsole-plugins/obr/src/main/java/org/apache/felix/webconsole/plugins/obr/internal/OsgiBundleRepositoryRenderHelper.java
@@ -29,7 +29,6 @@ import java.util.Map.Entry;
 import jakarta.servlet.ServletException;
 
 import org.apache.felix.utils.json.JSONWriter;
-import org.apache.felix.webconsole.AbstractWebConsolePlugin;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Version;