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

commit e76bd5bb1d877efb0cc8955d0d46a6864b6e7bc5
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Aug 24 17:25:16 2023 +0200

    FELIX-6631 : Migrate webconsole plugins to jakarta.servlet api
---
 healthcheck/webconsoleplugin/bnd.bnd                           |  1 +
 healthcheck/webconsoleplugin/pom.xml                           |  8 +++++---
 .../felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java  | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/healthcheck/webconsoleplugin/bnd.bnd 
b/healthcheck/webconsoleplugin/bnd.bnd
index 4fdc413baf..a3ea104aa0 100644
--- a/healthcheck/webconsoleplugin/bnd.bnd
+++ b/healthcheck/webconsoleplugin/bnd.bnd
@@ -3,3 +3,4 @@ Bundle-Description: ${project.description}
 Bundle-DocURL: https://felix.apache.org
 Bundle-License: Apache License, Version 2.0
 Bundle-Vendor: The Apache Software Foundation
+Import-Package: jakarta.servlet;version="[5, 
7)",jakarta.servlet.http;version="[5, 7)",*
\ No newline at end of file
diff --git a/healthcheck/webconsoleplugin/pom.xml 
b/healthcheck/webconsoleplugin/pom.xml
index 99b54bb785..f6e8b0631a 100644
--- a/healthcheck/webconsoleplugin/pom.xml
+++ b/healthcheck/webconsoleplugin/pom.xml
@@ -39,7 +39,9 @@
     
     <properties>
         <felix.java.version>8</felix.java.version>
+        <servlet.api>5.0.0</servlet.api>
     </properties>
+
     <scm>
         
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
         
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
@@ -101,9 +103,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${servlet.api}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git 
a/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
 
b/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
index 8ff09500ee..970a4830ea 100644
--- 
a/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
+++ 
b/healthcheck/webconsoleplugin/src/main/java/org/apache/felix/hc/webconsole/impl/HealthCheckWebconsolePlugin.java
@@ -29,11 +29,11 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.felix.hc.api.HealthCheck;
 import org.apache.felix.hc.api.Result;