You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2025/09/17 13:45:04 UTC

(commons-jcs) 01/07: Move from javax to jakarta

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

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git

commit 948442e6e0a61120780ed2d609bbfdc7f3ccda5e
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 09:28:48 2025 +0200

    Move from javax to jakarta
---
 commons-jcs3-core/pom.xml                                    |  4 ++--
 .../auxiliary/remote/http/server/RemoteHttpCacheServlet.java | 12 ++++++------
 .../auxiliary/remote/server/RemoteCacheStartupServlet.java   | 12 ++++++------
 .../jcs3/utils/servlet/JCSServletContextListener.java        |  6 +++---
 commons-jcs3-jcache-extras/pom.xml                           |  5 -----
 pom.xml                                                      |  6 +++---
 6 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index 42d23832..94b3d5d4 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -99,8 +99,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <optional>true</optional>
     </dependency>
   </dependencies>
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
index 36d4b33b..d71627b9 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
@@ -28,12 +28,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.jcs3.access.exception.CacheException;
 import org.apache.commons.jcs3.auxiliary.AuxiliaryCacheConfigurator;
 import org.apache.commons.jcs3.auxiliary.remote.http.behavior.IRemoteHttpCacheConstants;
@@ -48,6 +42,12 @@ import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.utils.config.PropertySetter;
 import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
 
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * This servlet simply reads and writes objects. The requests are packaged in a general wrapper. The
  * processor works on the wrapper object and returns a response wrapper.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
index f523c06e..703c50d0 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
@@ -26,12 +26,6 @@ import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.util.Properties;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.access.exception.CacheException;
 import org.apache.commons.jcs3.auxiliary.remote.RemoteUtils;
@@ -39,6 +33,12 @@ import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
 import org.apache.commons.jcs3.log.Log;
 import org.apache.commons.jcs3.utils.net.HostNameUtil;
 
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * This servlet can be used to startup the JCS remote cache. It is easy to
  * deploy the remote server in a tomcat base. This give you an easy way to
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
index de0d7828..7031ed07 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
@@ -19,12 +19,12 @@ package org.apache.commons.jcs3.utils.servlet;
  * under the License.
  */
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.apache.commons.jcs3.JCS;
 import org.apache.commons.jcs3.log.Log;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+
 /**
  * If you add this to the context listeners section of your web.xml file, this will shutdown JCS
  * gracefully.
diff --git a/commons-jcs3-jcache-extras/pom.xml b/commons-jcs3-jcache-extras/pom.xml
index 7813a055..9cc4e3ff 100644
--- a/commons-jcs3-jcache-extras/pom.xml
+++ b/commons-jcs3-jcache-extras/pom.xml
@@ -54,11 +54,6 @@
       <artifactId>commons-jcs3-jcache</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
diff --git a/pom.xml b/pom.xml
index 46e6983a..24b20651 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,9 +355,9 @@
       </dependency>
 
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>6.1.0</version>
         <optional>true</optional>
       </dependency>