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 bdb075a22b FELIX-6627 : Migrate inventory to jakarta.servlet API
bdb075a22b is described below
commit bdb075a22bdca83e598788b2ffbcbacc3a87d9ec
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Aug 16 15:50:59 2023 +0200
FELIX-6627 : Migrate inventory to jakarta.servlet API
---
inventory/pom.xml | 12 ++++++------
.../felix/inventory/impl/AbstractWebConsolePlugin.java | 6 +++---
.../felix/inventory/impl/webconsole/ConsoleConstants.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/inventory/pom.xml b/inventory/pom.xml
index ec00c2cef5..f64cc01fb9 100644
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -65,12 +65,12 @@
org.apache.felix.inventory.impl.Activator
</Bundle-Activator>
<Import-Package>
- javax.servlet;resolution:=optional,
- javax.servlet.http;resolution:=optional,
+ jakarta.servlet;resolution:=optional,
+ jakarta.servlet.http;resolution:=optional,
*
</Import-Package>
<DynamicImport-Package>
- javax.servlet, javax.servlet.http
+ jakarta.servlet, jakarta.servlet.http
</DynamicImport-Package>
</instructions>
</configuration>
@@ -98,9 +98,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>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
b/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
index 6a595b2c57..d8e063f8ad 100644
---
a/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
+++
b/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
@@ -21,9 +21,9 @@ import java.text.DateFormat;
import java.util.Date;
import java.util.Locale;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.impl.helper.ConfigurationWriter;
diff --git
a/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConsoleConstants.java
b/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConsoleConstants.java
index 2568170dd0..5fc16e7d97 100644
---
a/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConsoleConstants.java
+++
b/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConsoleConstants.java
@@ -19,7 +19,7 @@ package org.apache.felix.inventory.impl.webconsole;
public class ConsoleConstants
{
- public static final String INTERFACE_SERVLET = "javax.servlet.Servlet";
//$NON-NLS-1$
+ public static final String INTERFACE_SERVLET = "jakarta.servlet.Servlet";
//$NON-NLS-1$
public static final String INTERFACE_CONFIGURATION_PRINTER =
"org.apache.felix.webconsole.ConfigurationPrinter"; //$NON-NLS-1$
