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 8391f32d5a322a245f99f5348fdccdde06535557
Author: Thomas Vandahl <t...@apache.org>
AuthorDate: Wed Sep 17 15:42:39 2025 +0200
Move from javax to jakarta
---
commons-jcs3-jcache-extras/pom.xml | 10 +++++++---
.../jcs3/jcache/extras/web/InMemoryResponse.java | 18 ++++++-----------
.../jcs3/jcache/extras/web/JCacheFilter.java | 23 +++++++++++-----------
.../jcs3/jcache/extras/web/JCacheFilterTest.java | 10 +++++-----
4 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/commons-jcs3-jcache-extras/pom.xml
b/commons-jcs3-jcache-extras/pom.xml
index a058087f..1ea95fdc 100644
--- a/commons-jcs3-jcache-extras/pom.xml
+++ b/commons-jcs3-jcache-extras/pom.xml
@@ -37,8 +37,12 @@
<artifactId>cache-api</artifactId>
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@@ -83,7 +87,7 @@
<commons.module.name>org.apache.commons.jcs3.jcache.extras</commons.module.name>
<!-- project.build.outputTimestamp is managed by Maven plugins, see
https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
- <tomcat.version>9.0.105</tomcat.version>
+ <tomcat.version>11.0.8</tomcat.version>
</properties>
<profiles>
<profile>
diff --git
a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
index 06fd65f1..bdd0cfc9 100644
---
a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
+++
b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java
@@ -31,11 +31,12 @@ import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.CopyOnWriteArraySet;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+
public class InMemoryResponse extends HttpServletResponseWrapper implements
Serializable
{
@@ -277,11 +278,4 @@ public class InMemoryResponse extends
HttpServletResponseWrapper implements Seri
status = i;
super.setStatus(i);
}
-
- @Override
- public void setStatus(final int i, final String s)
- {
- status = i;
- super.setStatus(i, s);
- }
}
diff --git
a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilter.java
b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilter.java
index 4aab3051..238ad20e 100644
---
a/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilter.java
+++
b/commons-jcs3-jcache-extras/src/main/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilter.java
@@ -19,7 +19,6 @@
package org.apache.commons.jcs3.jcache.extras.web;
import static java.util.Collections.list;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -40,15 +39,16 @@ import javax.cache.Caching;
import javax.cache.configuration.FactoryBuilder;
import javax.cache.configuration.MutableConfiguration;
import javax.cache.spi.CachingProvider;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
public class JCacheFilter implements Filter
{
@@ -149,6 +149,7 @@ public class JCacheFilter implements Filter
this.gzip = gzip;
}
}
+
private static void checkResponse(final ServletResponse servletResponse)
{
if (servletResponse.isCommitted()) {
@@ -223,7 +224,7 @@ public class JCacheFilter implements Filter
cache.put(key, page);
}
- if (page.status == SC_OK) {
+ if (page.status == HttpServletResponse.SC_OK) {
checkResponse(httpServletResponse);
if (gzip)
diff --git
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
index ada66031..aa17ea1b 100644
---
a/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
+++
b/commons-jcs3-jcache-extras/src/test/java/org/apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java
@@ -26,11 +26,6 @@ import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
@@ -42,6 +37,11 @@ import org.apache.tomcat.util.descriptor.web.FilterMap;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
class JCacheFilterTest
{
public static class Empty extends HttpServlet {
