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:03 UTC
(commons-jcs) branch master updated (f368d679 -> 54932dbe)
This is an automated email from the ASF dual-hosted git repository.
tv pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
from f368d679 Use double-check locking
new 948442e6 Move from javax to jakarta
new 6186d25b Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
new c075fe9a Update Javadoc
new 14a94464 Fix test
new f77665dc Updates for jakarta
new 8391f32d Move from javax to jakarta
new 54932dbe Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
commons-jcs3-core/pom.xml | 10 +++++-----
.../remote/http/server/RemoteHttpCacheServlet.java | 16 +++++++--------
.../remote/server/RemoteCacheStartupServlet.java | 12 +++++------
.../utils/servlet/JCSServletContextListener.java | 10 +++++-----
.../server/RemoteHttpCacheServletUnitTest.java | 2 +-
commons-jcs3-jcache-extras/pom.xml | 15 +++++++-------
.../jcs3/jcache/extras/web/InMemoryResponse.java | 18 ++++++-----------
.../jcs3/jcache/extras/web/JCacheFilter.java | 23 +++++++++++-----------
.../jcs3/jcache/extras/web/JCacheFilterTest.java | 10 +++++-----
commons-jcs3-jcache-tck/pom.xml | 4 ++--
commons-jcs3-jcache/pom.xml | 4 ++--
pom.xml | 12 +++++------
12 files changed, 64 insertions(+), 72 deletions(-)
(commons-jcs) 06/07: Move from javax to jakarta
Posted by tv...@apache.org.
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 <tv...@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 {
(commons-jcs) 07/07: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
Posted by tv...@apache.org.
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 54932dbe66cab1156f331044e31da59c14f68831
Merge: 8391f32d f368d679
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Wed Sep 17 15:44:48 2025 +0200
Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-jcs.git
.github/pull_request_template.md | 6 +-
.github/workflows/codeql-analysis.yml | 12 +-
.github/workflows/dependency-review.yml | 4 +-
.github/workflows/maven.yml | 6 +-
.github/workflows/scorecards-analysis.yml | 4 +-
.../javagroups/LateralJGReceiverConnection.java | 2 +-
.../lateral/javagroups/LateralJGSender.java | 2 +-
.../lateral/javagroups/utils/JGSocketOpener.java | 6 +-
commons-jcs3-core/pom.xml | 2 +-
.../src/main/java/org/apache/commons/jcs3/JCS.java | 35 ++---
.../commons/jcs3/access/GroupCacheAccess.java | 6 +-
.../commons/jcs3/admin/CacheElementInfo.java | 14 +-
.../apache/commons/jcs3/admin/CacheRegionInfo.java | 146 ++++++++++-----------
.../apache/commons/jcs3/admin/JCSAdminBean.java | 8 +-
.../org/apache/commons/jcs3/admin/JCSJMXBean.java | 8 +-
.../jcs3/auxiliary/disk/block/BlockDiskCache.java | 6 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 4 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 8 +-
.../disk/jdbc/dsfactory/DataSourceFactory.java | 2 +-
.../dsfactory/SharedPoolDataSourceFactory.java | 4 +-
.../jcs3/engine/control/CompositeCache.java | 2 +-
.../jcs3/engine/control/group/GroupAttrName.java | 42 +-----
.../commons/jcs3/engine/control/group/GroupId.java | 36 +----
.../AbstractDoubleLinkedListMemoryCache.java | 8 +-
.../jcs3/engine/memory/AbstractMemoryCache.java | 6 +-
.../commons/jcs3/engine/stats/StatElement.java | 43 +-----
.../jcs3/engine/stats/behavior/IStatElement.java | 12 --
.../jcs3/io/ObjectInputStreamClassLoaderAware.java | 2 +-
.../main/java/org/apache/commons/jcs3/log/Log.java | 12 +-
.../apache/commons/jcs3/log/SystemLogAdapter.java | 16 +--
.../commons/jcs3/utils/config/OptionConverter.java | 26 ++--
.../commons/jcs3/utils/config/PropertySetter.java | 8 +-
.../commons/jcs3/utils/net/HostNameUtil.java | 10 +-
.../commons/jcs3/utils/struct/AbstractLRUMap.java | 8 +-
.../jcs3/utils/threadpool/ThreadPoolManager.java | 4 +-
.../AuxiliaryCacheConfiguratorUnitTest.java | 4 +-
.../disk/block/BlockDiskCacheSteadyLoadTest.java | 4 +-
.../indexed/HugeQuantityIndDiskCacheLoadTest.java | 2 +-
.../disk/indexed/IndexDiskCacheCountUnitTest.java | 10 +-
.../disk/indexed/IndexDiskCacheSizeUnitTest.java | 10 +-
.../IndexedDiskCacheConcurrentUnitTest.java | 4 +-
.../IndexedDiskCacheDefragPerformanceTest.java | 4 +-
.../indexed/IndexedDiskCacheKeyStoreUnitTest.java | 8 +-
.../indexed/IndexedDiskCacheNoMemoryUnitTest.java | 2 +-
.../indexed/IndexedDiskCacheSteadyLoadTest.java | 4 +-
.../lateral/socket/tcp/TestTCPLateralUnitTest.java | 2 +-
.../memory/lru/LHMLRUMemoryCacheUnitTest.java | 32 ++---
.../engine/memory/mru/MRUMemoryCacheUnitTest.java | 32 ++---
.../soft/SoftReferenceMemoryCacheUnitTest.java | 18 +--
.../commons/jcs3/utils/props/PropertyLoader.java | 2 +-
commons-jcs3-dist/pom.xml | 2 +-
commons-jcs3-jcache-extras/pom.xml | 4 +-
commons-jcs3-jcache-openjpa/pom.xml | 2 +-
commons-jcs3-jcache-tck/pom.xml | 2 +-
.../jcache/EnsureCDIIsTestedWhenTCKsRunTest.java | 2 +-
commons-jcs3-jcache/pom.xml | 2 +-
.../org/apache/commons/jcs3/jcache/JCSCache.java | 4 +-
.../commons/jcs3/jcache/JCSCachingManager.java | 2 +-
pom.xml | 13 +-
src/changes/changes.xml | 12 +-
.../engine/memory/arc/ARCMemoryCacheUnitTest.java | 6 +-
61 files changed, 295 insertions(+), 414 deletions(-)
(commons-jcs) 04/07: Fix test
Posted by tv...@apache.org.
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 14a94464d17994e9d4897bbc10a6524a654f5572
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 10:23:30 2025 +0200
Fix test
---
.../jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java | 6 ++----
.../remote/http/server/RemoteHttpCacheServletUnitTest.java | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
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 2d305228..90f43e64 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
@@ -42,7 +42,6 @@ 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;
@@ -163,11 +162,10 @@ public class RemoteHttpCacheServlet
* <p>
* This provides an easy extension point. Simply extend this servlet and override the init
* method to change the way the properties are loaded.
- * @param config
* @throws ServletException
*/
@Override
- public void init( final ServletConfig config )
+ public void init()
throws ServletException
{
try
@@ -181,7 +179,7 @@ public class RemoteHttpCacheServlet
remoteCacheService = createRemoteHttpCacheService( cacheMgr );
- super.init( config );
+ super.init();
}
/**
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
index 164bc09b..36b7a8bb 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServletUnitTest.java
@@ -47,7 +47,7 @@ class RemoteHttpCacheServletUnitTest
throws Exception
{
servlet = new RemoteHttpCacheServlet();
- servlet.init(null);
+ servlet.init();
remoteHttpCacheService = new MockRemoteCacheService<>();
servlet.setRemoteCacheService( remoteHttpCacheService );
(commons-jcs) 03/07: Update Javadoc
Posted by tv...@apache.org.
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 c075fe9afdbf92056b91df6bb9e46b69cb7d6342
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 10:23:06 2025 +0200
Update Javadoc
---
.../apache/commons/jcs3/utils/servlet/JCSServletContextListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 d1b9e231..598d12e6 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
@@ -48,7 +48,7 @@ public class JCSServletContextListener
/**
* Shutdown JCS.
*
- * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
+ * @see jakarta.servlet.ServletContextListener#contextDestroyed(jakarta.servlet.ServletContextEvent)
*/
@Override
public void contextDestroyed( final ServletContextEvent arg0 )
@@ -61,7 +61,7 @@ public class JCSServletContextListener
/**
* This does nothing. We don't want to initialize the cache here.
*
- * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
+ * @see jakarta.servlet.ServletContextListener#contextInitialized(jakarta.servlet.ServletContextEvent)
*/
@Override
public void contextInitialized( final ServletContextEvent arg0 )
(commons-jcs) 05/07: Updates for jakarta
Posted by tv...@apache.org.
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 f77665dcc51bb6ee49a72630312603cb6b861ef5
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 10:24:36 2025 +0200
Updates for jakarta
---
commons-jcs3-core/pom.xml | 6 +++---
commons-jcs3-jcache-tck/pom.xml | 4 ++--
commons-jcs3-jcache/pom.xml | 4 ++--
pom.xml | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index a4421d89..85aeb97b 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -39,14 +39,14 @@
</scm>
<properties>
- <commons.bc.version>3.1</commons.bc.version>
+ <commons.bc.version>3.2</commons.bc.version>
<commons.module.name>org.apache.commons.jcs3.core</commons.module.name>
<!-- generate report even if there are binary incompatible changes -->
<commons.japicmp.breakBuildOnBinaryIncompatibleModifications>false</commons.japicmp.breakBuildOnBinaryIncompatibleModifications>
- <commons.japicmp.ignoreMissingClasses>false</commons.japicmp.ignoreMissingClasses>
+ <commons.japicmp.ignoreMissingClasses>true</commons.japicmp.ignoreMissingClasses>
<japicmp.skip>false</japicmp.skip>
<commons.osgi.import>
- javax.servlet.*;resolution:=optional,
+ jakarta.servlet.*;resolution:=optional,
org.apache.commons.dbcp2.*;resolution:=optional,
org.apache.http.*;resolution:=optional
</commons.osgi.import>
diff --git a/commons-jcs3-jcache-tck/pom.xml b/commons-jcs3-jcache-tck/pom.xml
index 2d4599f7..1df4604a 100644
--- a/commons-jcs3-jcache-tck/pom.xml
+++ b/commons-jcs3-jcache-tck/pom.xml
@@ -105,8 +105,8 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
<dependency>
diff --git a/commons-jcs3-jcache/pom.xml b/commons-jcs3-jcache/pom.xml
index 824fe0ee..9e4a9b48 100644
--- a/commons-jcs3-jcache/pom.xml
+++ b/commons-jcs3-jcache/pom.xml
@@ -42,8 +42,8 @@
<artifactId>cache-api</artifactId>
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 2128e633..e4e318b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,9 +362,9 @@
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>8.0.1</version>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
+ <version>8.0.0</version>
<exclusions>
<exclusion>
<groupId>com.sun.mail</groupId>
(commons-jcs) 02/07: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
Posted by tv...@apache.org.
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 6186d25bdcbf0289ebcca8a26688bfa187e50968
Merge: 948442e6 48d60ed9
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Thu Jun 12 09:29:04 2025 +0200
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-jcs.git
.asf.yaml | 2 +-
.gitattributes | 2 +-
.github/GH-ROBOTS.txt | 2 +-
.github/dependabot.yml | 2 +-
.github/pull_request_template.md | 2 +-
.github/workflows/codeql-analysis.yml | 8 ++++----
.github/workflows/dependency-review.yml | 2 +-
.github/workflows/maven.yml | 2 +-
.github/workflows/scorecards-analysis.yml | 6 +++---
CODE_OF_CONDUCT.md | 2 +-
CONTRIBUTING.md | 2 +-
LICENSE.txt | 2 +-
README.md | 2 +-
RELEASE-NOTES.txt | 2 +-
SECURITY.md | 2 +-
auxiliary-builds/javagroups/project.properties | 2 +-
auxiliary-builds/javagroups/project.xml | 2 +-
.../apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java | 2 +-
.../commons/jcs/auxiliary/javagroups/JavaGroupsCacheFactory.java | 2 +-
.../commons/jcs/auxiliary/javagroups/JavaGroupsCacheTest.ccf | 2 +-
.../commons/jcs/auxiliary/javagroups/JavaGroupsCacheTest.java | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCacheWithGetTest.ccf | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCacheWithGetTest.java | 2 +-
auxiliary-builds/jdk14/project.properties | 2 +-
auxiliary-builds/jdk14/project.xml | 2 +-
.../apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java | 2 +-
.../jcs/auxiliary/javagroups/JavaGroupsCacheAttributes.java | 2 +-
.../commons/jcs/auxiliary/javagroups/JavaGroupsCacheFactory.java | 2 +-
.../apache/commons/jcs/auxiliary/lateral/LateralCacheFactory.java | 2 +-
.../apache/commons/jcs/auxiliary/lateral/LateralCacheManager.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java | 2 +-
.../auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/LateralJGCacheFactory.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/LateralJGCacheManager.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/LateralJGReceiver.java | 2 +-
.../auxiliary/lateral/javagroups/LateralJGReceiverConnection.java | 2 +-
.../commons/jcs/auxiliary/lateral/javagroups/LateralJGSender.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/LateralJGService.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/behavior/IJGConstants.java | 2 +-
.../lateral/javagroups/behavior/ILateralCacheJGListener.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java | 2 +-
.../jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java | 2 +-
.../apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java | 2 +-
auxiliary-builds/jdk14/src/test-conf/log4j.properties | 2 +-
checkstyle.xml | 2 +-
commons-jcs3-core/pom.xml | 2 +-
commons-jcs3-core/src/main/java/org/apache/commons/jcs3/JCS.java | 2 +-
.../java/org/apache/commons/jcs3/access/AbstractCacheAccess.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/access/CacheAccess.java | 2 +-
.../java/org/apache/commons/jcs3/access/GroupCacheAccess.java | 2 +-
.../org/apache/commons/jcs3/access/behavior/ICacheAccess.java | 2 +-
.../commons/jcs3/access/behavior/ICacheAccessManagement.java | 2 +-
.../apache/commons/jcs3/access/behavior/IGroupCacheAccess.java | 2 +-
.../org/apache/commons/jcs3/access/exception/CacheException.java | 2 +-
.../commons/jcs3/access/exception/ConfigurationException.java | 2 +-
.../commons/jcs3/access/exception/InvalidArgumentException.java | 2 +-
.../commons/jcs3/access/exception/InvalidGroupException.java | 2 +-
.../commons/jcs3/access/exception/InvalidHandleException.java | 2 +-
.../commons/jcs3/access/exception/ObjectExistsException.java | 2 +-
.../commons/jcs3/access/exception/ObjectNotFoundException.java | 2 +-
.../main/java/org/apache/commons/jcs3/access/package-info.java | 2 +-
.../main/java/org/apache/commons/jcs3/admin/CacheElementInfo.java | 2 +-
.../main/java/org/apache/commons/jcs3/admin/CacheRegionInfo.java | 2 +-
.../org/apache/commons/jcs3/admin/CountingOnlyOutputStream.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/admin/JCSAdmin.jsp | 2 +-
.../src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/admin/JCSJMXBean.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCache.java | 2 +-
.../commons/jcs3/auxiliary/AbstractAuxiliaryCacheAttributes.java | 2 +-
.../jcs3/auxiliary/AbstractAuxiliaryCacheEventLogging.java | 2 +-
.../commons/jcs3/auxiliary/AbstractAuxiliaryCacheFactory.java | 2 +-
.../commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java | 2 +-
.../java/org/apache/commons/jcs3/auxiliary/AuxiliaryCache.java | 2 +-
.../apache/commons/jcs3/auxiliary/AuxiliaryCacheAttributes.java | 2 +-
.../apache/commons/jcs3/auxiliary/AuxiliaryCacheConfigurator.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/AuxiliaryCacheFactory.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java | 2 +-
.../commons/jcs3/auxiliary/disk/AbstractDiskCacheAttributes.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/disk/PurgatoryElement.java | 2 +-
.../jcs3/auxiliary/disk/behavior/IDiskCacheAttributes.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java | 2 +-
.../apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCacheAttributes.java | 2 +-
.../commons/jcs3/auxiliary/disk/block/BlockDiskCacheFactory.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskElementDescriptor.java | 2 +-
.../commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java | 2 +-
.../apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java | 2 +-
.../commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java | 2 +-
.../jcs3/auxiliary/disk/indexed/IndexedDiskCacheAttributes.java | 2 +-
.../jcs3/auxiliary/disk/indexed/IndexedDiskCacheFactory.java | 2 +-
.../commons/jcs3/auxiliary/disk/indexed/IndexedDiskDumper.java | 2 +-
.../jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java | 2 +-
.../apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java | 2 +-
.../commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java | 2 +-
.../commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 2 +-
.../apache/commons/jcs3/auxiliary/disk/jdbc/ShrinkerThread.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/disk/jdbc/TableState.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/dsfactory/DataSourceFactory.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java | 2 +-
.../disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java | 2 +-
.../commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheAttributes.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/util/ScheduleParser.java | 2 +-
.../java/org/apache/commons/jcs3/auxiliary/disk/package-info.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java | 2 +-
.../commons/jcs3/auxiliary/lateral/LateralCacheAttributes.java | 2 +-
.../commons/jcs3/auxiliary/lateral/LateralCacheMonitor.java | 2 +-
.../apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java | 2 +-
.../commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/lateral/LateralCommand.java | 2 +-
.../commons/jcs3/auxiliary/lateral/LateralElementDescriptor.java | 2 +-
.../jcs3/auxiliary/lateral/behavior/ILateralCacheAttributes.java | 2 +-
.../jcs3/auxiliary/lateral/behavior/ILateralCacheListener.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/lateral/package-info.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java | 2 +-
.../auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/LateralTCPListener.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/LateralTCPService.java | 2 +-
.../auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java | 2 +-
.../lateral/socket/tcp/behavior/ITCPLateralCacheAttributes.java | 2 +-
.../main/java/org/apache/commons/jcs3/auxiliary/package-info.java | 2 +-
.../jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java | 2 +-
.../jcs3/auxiliary/remote/AbstractRemoteCacheListener.java | 2 +-
.../jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java | 2 +-
.../jcs3/auxiliary/remote/CommonRemoteCacheAttributes.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java | 2 +-
.../commons/jcs3/auxiliary/remote/RemoteCacheAttributes.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheMonitor.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java | 2 +-
.../commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java | 2 +-
.../auxiliary/remote/behavior/ICommonRemoteCacheAttributes.java | 2 +-
.../jcs3/auxiliary/remote/behavior/IRemoteCacheAttributes.java | 2 +-
.../jcs3/auxiliary/remote/behavior/IRemoteCacheClient.java | 2 +-
.../jcs3/auxiliary/remote/behavior/IRemoteCacheConstants.java | 2 +-
.../jcs3/auxiliary/remote/behavior/IRemoteCacheDispatcher.java | 2 +-
.../jcs3/auxiliary/remote/behavior/IRemoteCacheListener.java | 2 +-
.../auxiliary/remote/http/behavior/IRemoteHttpCacheConstants.java | 2 +-
.../jcs3/auxiliary/remote/http/client/AbstractHttpClient.java | 2 +-
.../jcs3/auxiliary/remote/http/client/RemoteHttpCache.java | 2 +-
.../auxiliary/remote/http/client/RemoteHttpCacheAttributes.java | 2 +-
.../jcs3/auxiliary/remote/http/client/RemoteHttpCacheClient.java | 2 +-
.../auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java | 2 +-
.../jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactory.java | 2 +-
.../jcs3/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java | 2 +-
.../auxiliary/remote/http/client/RemoteHttpClientListener.java | 2 +-
.../remote/http/client/behavior/IRemoteHttpCacheClient.java | 2 +-
.../auxiliary/remote/http/server/AbstractRemoteCacheService.java | 2 +-
.../remote/http/server/RemoteHttpCacheServerAttributes.java | 2 +-
.../jcs3/auxiliary/remote/http/server/RemoteHttpCacheService.java | 2 +-
.../jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/remote/package-info.java | 2 +-
.../commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java | 2 +-
.../jcs3/auxiliary/remote/server/RemoteCacheServerAttributes.java | 2 +-
.../jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java | 2 +-
.../jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java | 2 +-
.../remote/server/TimeoutConfigurableRMISocketFactory.java | 2 +-
.../jcs3/auxiliary/remote/server/behavior/IRemoteCacheServer.java | 2 +-
.../remote/server/behavior/IRemoteCacheServerAttributes.java | 2 +-
.../commons/jcs3/auxiliary/remote/server/behavior/RemoteType.java | 2 +-
.../jcs3/auxiliary/remote/util/RemoteCacheRequestFactory.java | 2 +-
.../commons/jcs3/auxiliary/remote/value/RemoteCacheRequest.java | 2 +-
.../commons/jcs3/auxiliary/remote/value/RemoteCacheResponse.java | 2 +-
.../commons/jcs3/auxiliary/remote/value/RemoteRequestType.java | 2 +-
.../org/apache/commons/jcs3/engine/AbstractCacheEventQueue.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/CacheAdaptor.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/CacheElement.java | 2 +-
.../org/apache/commons/jcs3/engine/CacheElementSerialized.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/CacheEventQueue.java | 2 +-
.../org/apache/commons/jcs3/engine/CacheEventQueueFactory.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/engine/CacheInfo.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/CacheListeners.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/engine/CacheStatus.java | 2 +-
.../java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java | 2 +-
.../org/apache/commons/jcs3/engine/CompositeCacheAttributes.java | 2 +-
.../java/org/apache/commons/jcs3/engine/ElementAttributes.java | 2 +-
.../org/apache/commons/jcs3/engine/PooledCacheEventQueue.java | 2 +-
.../java/org/apache/commons/jcs3/engine/ZombieCacheService.java | 2 +-
.../apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java | 2 +-
.../java/org/apache/commons/jcs3/engine/ZombieCacheWatch.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/behavior/ICache.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/ICacheElement.java | 2 +-
.../commons/jcs3/engine/behavior/ICacheElementSerialized.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/ICacheEventQueue.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/ICacheListener.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/ICacheObserver.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/ICacheService.java | 2 +-
.../apache/commons/jcs3/engine/behavior/ICacheServiceAdmin.java | 2 +-
.../commons/jcs3/engine/behavior/ICacheServiceNonLocal.java | 2 +-
.../java/org/apache/commons/jcs3/engine/behavior/ICacheType.java | 2 +-
.../commons/jcs3/engine/behavior/ICompositeCacheAttributes.java | 2 +-
.../commons/jcs3/engine/behavior/ICompositeCacheManager.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IElementAttributes.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IElementSerializer.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IProvideScheduler.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IRequireScheduler.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IShutdownObservable.java | 2 +-
.../apache/commons/jcs3/engine/behavior/IShutdownObserver.java | 2 +-
.../java/org/apache/commons/jcs3/engine/behavior/IZombie.java | 2 +-
.../org/apache/commons/jcs3/engine/behavior/package-info.java | 2 +-
.../org/apache/commons/jcs3/engine/control/CompositeCache.java | 2 +-
.../commons/jcs3/engine/control/CompositeCacheConfigurator.java | 2 +-
.../apache/commons/jcs3/engine/control/CompositeCacheManager.java | 2 +-
.../apache/commons/jcs3/engine/control/event/ElementEvent.java | 2 +-
.../commons/jcs3/engine/control/event/ElementEventQueue.java | 2 +-
.../jcs3/engine/control/event/behavior/ElementEventType.java | 2 +-
.../commons/jcs3/engine/control/event/behavior/IElementEvent.java | 2 +-
.../jcs3/engine/control/event/behavior/IElementEventHandler.java | 2 +-
.../jcs3/engine/control/event/behavior/IElementEventQueue.java | 2 +-
.../apache/commons/jcs3/engine/control/group/GroupAttrName.java | 2 +-
.../org/apache/commons/jcs3/engine/control/group/GroupId.java | 2 +-
.../java/org/apache/commons/jcs3/engine/control/package-info.java | 2 +-
.../java/org/apache/commons/jcs3/engine/logging/CacheEvent.java | 2 +-
.../commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java | 2 +-
.../apache/commons/jcs3/engine/logging/behavior/ICacheEvent.java | 2 +-
.../commons/jcs3/engine/logging/behavior/ICacheEventLogger.java | 2 +-
.../apache/commons/jcs3/engine/match/KeyMatcherPatternImpl.java | 2 +-
.../apache/commons/jcs3/engine/match/behavior/IKeyMatcher.java | 2 +-
.../jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java | 2 +-
.../apache/commons/jcs3/engine/memory/AbstractMemoryCache.java | 2 +-
.../apache/commons/jcs3/engine/memory/behavior/IMemoryCache.java | 2 +-
.../apache/commons/jcs3/engine/memory/fifo/FIFOMemoryCache.java | 2 +-
.../apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/lru/LRUMemoryCache.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/lru/package-info.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/mru/MRUMemoryCache.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/mru/package-info.java | 2 +-
.../java/org/apache/commons/jcs3/engine/memory/package-info.java | 2 +-
.../commons/jcs3/engine/memory/shrinking/ShrinkerThread.java | 2 +-
.../commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/soft/package-info.java | 2 +-
.../commons/jcs3/engine/memory/util/MemoryElementDescriptor.java | 2 +-
.../jcs3/engine/memory/util/SoftReferenceElementDescriptor.java | 2 +-
.../main/java/org/apache/commons/jcs3/engine/package-info.java | 2 +-
.../java/org/apache/commons/jcs3/engine/stats/CacheStats.java | 2 +-
.../java/org/apache/commons/jcs3/engine/stats/StatElement.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/engine/stats/Stats.java | 2 +-
.../apache/commons/jcs3/engine/stats/behavior/ICacheStats.java | 2 +-
.../apache/commons/jcs3/engine/stats/behavior/IStatElement.java | 2 +-
.../org/apache/commons/jcs3/engine/stats/behavior/IStats.java | 2 +-
.../apache/commons/jcs3/io/ObjectInputStreamClassLoaderAware.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/log/Log.java | 2 +-
.../main/java/org/apache/commons/jcs3/log/MessageFormatter.java | 2 +-
.../main/java/org/apache/commons/jcs3/log/SystemLogAdapter.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/package-info.java | 2 +-
.../apache/commons/jcs3/utils/access/AbstractJCSWorkerHelper.java | 2 +-
.../main/java/org/apache/commons/jcs3/utils/access/JCSWorker.java | 2 +-
.../org/apache/commons/jcs3/utils/access/JCSWorkerHelper.java | 2 +-
.../org/apache/commons/jcs3/utils/config/OptionConverter.java | 2 +-
.../java/org/apache/commons/jcs3/utils/config/PropertySetter.java | 2 +-
.../apache/commons/jcs3/utils/config/PropertySetterException.java | 2 +-
.../java/org/apache/commons/jcs3/utils/config/package-info.java | 2 +-
.../apache/commons/jcs3/utils/discovery/DiscoveredService.java | 2 +-
.../commons/jcs3/utils/discovery/UDPDiscoveryAttributes.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoveryMessage.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoverySender.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoveryService.java | 2 +-
.../commons/jcs3/utils/discovery/behavior/IDiscoveryListener.java | 2 +-
.../main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java | 4 ++--
.../commons/jcs3/utils/serialization/CompressingSerializer.java | 2 +-
.../commons/jcs3/utils/serialization/EncryptingSerializer.java | 2 +-
.../jcs3/utils/serialization/SerializationConversionUtil.java | 2 +-
.../commons/jcs3/utils/serialization/StandardSerializer.java | 2 +-
.../commons/jcs3/utils/servlet/JCSServletContextListener.java | 2 +-
.../java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java | 2 +-
.../org/apache/commons/jcs3/utils/struct/DoubleLinkedList.java | 2 +-
.../apache/commons/jcs3/utils/struct/DoubleLinkedListNode.java | 2 +-
.../apache/commons/jcs3/utils/struct/LRUElementDescriptor.java | 2 +-
.../main/java/org/apache/commons/jcs3/utils/struct/LRUMap.java | 2 +-
.../apache/commons/jcs3/utils/threadpool/DaemonThreadFactory.java | 2 +-
.../apache/commons/jcs3/utils/threadpool/PoolConfiguration.java | 2 +-
.../apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java | 2 +-
.../java/org/apache/commons/jcs3/utils/timing/ElapsedTimer.java | 2 +-
.../java/org/apache/commons/jcs3/utils/zip/CompressionUtil.java | 2 +-
commons-jcs3-core/src/site/resources/profile.japicmp | 2 +-
commons-jcs3-core/src/site/resources/profile.noanimal | 2 +-
.../src/test/conf/JCSAdminServlet.velocity.properties | 2 +-
commons-jcs3-core/src/test/conf/LocalStrings.properties | 2 +-
commons-jcs3-core/src/test/conf/cache.ccf | 2 +-
commons-jcs3-core/src/test/conf/cache.policy | 2 +-
commons-jcs3-core/src/test/conf/cache2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cache3.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheB.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheBDB.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheD10A.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheD10B.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheID.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheJG1.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheJG2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheJG3.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheLMD1.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheNA.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheNA2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheNA3.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheNB.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRC.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRC1.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRC2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRCN1.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRCN2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRCSimple.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRC_CEL.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheRHTTP.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheTCP1.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheTCP2.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheTCP3.ccf | 2 +-
commons-jcs3-core/src/test/conf/cacheTCP4.ccf | 2 +-
commons-jcs3-core/src/test/conf/jcsutils.properties | 2 +-
commons-jcs3-core/src/test/conf/je.properties | 2 +-
commons-jcs3-core/src/test/conf/logger.properties | 2 +-
commons-jcs3-core/src/test/conf/myjetty.xml | 2 +-
commons-jcs3-core/src/test/conf/myjetty2.xml | 2 +-
commons-jcs3-core/src/test/conf/remote.cache.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cache2.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cache3.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cacheCEL.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cacheCEL_CSF.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cacheRS1.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.cacheRS2.ccf | 2 +-
commons-jcs3-core/src/test/conf/remote.tomcat.xml | 2 +-
commons-jcs3-core/src/test/conf/tomcat.xml | 2 +-
.../java/org/apache/commons/jcs3/ConcurrentRemovalLoadTest.java | 2 +-
.../org/apache/commons/jcs3/JCSCacheElementRetrievalUnitTest.java | 2 +-
.../org/apache/commons/jcs3/JCSConcurrentCacheAccessUnitTest.java | 2 +-
.../test/java/org/apache/commons/jcs3/JCSLightLoadUnitTest.java | 2 +-
.../org/apache/commons/jcs3/JCSRemovalSimpleConcurrentTest.java | 2 +-
.../src/test/java/org/apache/commons/jcs3/JCSThrashTest.java | 2 +-
.../src/test/java/org/apache/commons/jcs3/JCSUnitTest.java | 2 +-
.../org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java | 2 +-
.../src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java | 2 +-
.../java/org/apache/commons/jcs3/TestLogConfigurationUtil.java | 2 +-
.../test/java/org/apache/commons/jcs3/TestTCPLateralCache.java | 2 +-
.../test/java/org/apache/commons/jcs3/ZeroSizeCacheUnitTest.java | 2 +-
.../java/org/apache/commons/jcs3/access/CacheAccessUnitTest.java | 2 +-
.../org/apache/commons/jcs3/access/GroupCacheAccessUnitTest.java | 2 +-
.../org/apache/commons/jcs3/access/SystemPropertyUnitTest.java | 2 +-
.../test/java/org/apache/commons/jcs3/access/TestCacheAccess.java | 2 +-
.../java/org/apache/commons/jcs3/admin/AdminBeanUnitTest.java | 2 +-
.../org/apache/commons/jcs3/admin/CountingStreamUnitTest.java | 2 +-
.../src/test/java/org/apache/commons/jcs3/admin/TestJMX.java | 2 +-
.../jcs3/auxiliary/AuxiliaryCacheConfiguratorUnitTest.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/MockAuxiliaryCache.java | 2 +-
.../commons/jcs3/auxiliary/MockAuxiliaryCacheAttributes.java | 2 +-
.../apache/commons/jcs3/auxiliary/MockAuxiliaryCacheFactory.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/MockCacheEventLogger.java | 2 +-
.../commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/disk/DiskTestObject.java | 2 +-
.../commons/jcs3/auxiliary/disk/PurgatoryElementUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/block/AbstractBlockDiskCacheUnitTest.java | 2 +-
.../auxiliary/disk/block/BlockDiskCacheConcurrentUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCacheCountUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCacheKeyStoreUnitTest.java | 2 +-
.../disk/block/BlockDiskCacheRandomConcurrentTestUtil.java | 2 +-
.../disk/block/BlockDiskCacheSameRegionConcurrentUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCacheSizeUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/block/BlockDiskCacheSteadyLoadTest.java | 2 +-
.../commons/jcs3/auxiliary/disk/block/BlockDiskUnitTest.java | 2 +-
.../auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java | 2 +-
.../auxiliary/disk/indexed/AbstractIndexDiskCacheUnitTest.java | 2 +-
.../commons/jcs3/auxiliary/disk/indexed/DiskTestObjectUtil.java | 2 +-
.../auxiliary/disk/indexed/HugeQuantityIndDiskCacheLoadTest.java | 2 +-
.../jcs3/auxiliary/disk/indexed/IndexDiskCacheCountUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/indexed/IndexDiskCacheSizeUnitTest.java | 2 +-
.../indexed/IndexedDiskCacheConcurrentNoDeadLockUnitTest.java | 2 +-
.../disk/indexed/IndexedDiskCacheConcurrentUnitTest.java | 2 +-
.../disk/indexed/IndexedDiskCacheDefragPerformanceTest.java | 2 +-
.../auxiliary/disk/indexed/IndexedDiskCacheKeyStoreUnitTest.java | 2 +-
.../auxiliary/disk/indexed/IndexedDiskCacheNoMemoryUnitTest.java | 2 +-
.../disk/indexed/IndexedDiskCacheOptimizationUnitTest.java | 2 +-
.../disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java | 2 +-
.../indexed/IndexedDiskCacheSameRegionConcurrentUnitTest.java | 2 +-
.../auxiliary/disk/indexed/IndexedDiskCacheSteadyLoadTest.java | 2 +-
.../commons/jcs3/auxiliary/disk/indexed/LRUMapSizeVsCount.java | 2 +-
.../apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCacheSharedPoolUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java | 2 +-
.../commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheUnitTest.java | 2 +-
.../auxiliary/disk/jdbc/hsql/HSQLDiskCacheConcurrentUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheUnitTest.java | 2 +-
.../disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java | 2 +-
.../jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheUnitTest.java | 2 +-
.../disk/jdbc/mysql/util/ScheduleParserUtilUnitTest.java | 2 +-
.../jcs3/auxiliary/lateral/LateralCacheNoWaitFacadeUnitTest.java | 2 +-
.../lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java | 2 +-
.../lateral/socket/tcp/LateralTCPDiscoveryListenerUnitTest.java | 2 +-
.../socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java | 2 +-
.../lateral/socket/tcp/LateralTCPIssueRemoveOnPutUnitTest.java | 2 +-
.../lateral/socket/tcp/LateralTCPNoDeadLockConcurrentTest.java | 2 +-
.../jcs3/auxiliary/lateral/socket/tcp/TestTCPLateralUnitTest.java | 2 +-
.../commons/jcs3/auxiliary/remote/MockRemoteCacheClient.java | 2 +-
.../commons/jcs3/auxiliary/remote/MockRemoteCacheListener.java | 2 +-
.../commons/jcs3/auxiliary/remote/MockRemoteCacheService.java | 2 +-
.../commons/jcs3/auxiliary/remote/RemoteCacheClientTester.java | 2 +-
.../jcs3/auxiliary/remote/RemoteCacheListenerUnitTest.java | 2 +-
.../jcs3/auxiliary/remote/RemoteCacheNoWaitFacadeUnitTest.java | 2 +-
.../commons/jcs3/auxiliary/remote/RemoteCacheNoWaitUnitTest.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteCacheUnitTest.java | 2 +-
.../apache/commons/jcs3/auxiliary/remote/RemoteUtilsUnitTest.java | 2 +-
.../org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java | 2 +-
.../commons/jcs3/auxiliary/remote/TestRemoteCacheFactory.java | 2 +-
.../jcs3/auxiliary/remote/ZombieRemoteCacheServiceUnitTest.java | 2 +-
.../auxiliary/remote/http/client/MockRemoteCacheDispatcher.java | 2 +-
.../remote/http/client/RemoteHttpCacheClientUnitTest.java | 2 +-
.../remote/http/client/RemoteHttpCacheFactoryUnitTest.java | 2 +-
.../auxiliary/remote/http/client/RemoteHttpCacheManualTester.java | 2 +-
.../remote/http/server/RemoteHttpCacheServiceUnitTest.java | 2 +-
.../remote/http/server/RemoteHttpCacheServletUnitTest.java | 2 +-
.../remote/server/BasicRemoteCacheClientServerUnitTest.java | 2 +-
.../jcs3/auxiliary/remote/server/MockRMISocketFactory.java | 2 +-
.../remote/server/RemoteCacheServerAttributesUnitTest.java | 2 +-
.../auxiliary/remote/server/RemoteCacheServerFactoryUnitTest.java | 2 +-
.../auxiliary/remote/server/RemoteCacheServerStartupUtil.java | 2 +-
.../jcs3/auxiliary/remote/server/RemoteCacheServerUnitTest.java | 2 +-
.../server/TimeoutConfigurableRMISocketFactoryUnitTest.java | 2 +-
.../auxiliary/remote/util/RemoteCacheRequestFactoryUnitTest.java | 2 +-
.../commons/jcs3/engine/CacheEventQueueFactoryUnitTest.java | 2 +-
.../org/apache/commons/jcs3/engine/ElementAttributesUtils.java | 4 ++--
.../apache/commons/jcs3/engine/EventQueueConcurrentLoadTest.java | 2 +-
.../org/apache/commons/jcs3/engine/MockCacheServiceNonLocal.java | 2 +-
.../apache/commons/jcs3/engine/SystemPropertyUsageUnitTest.java | 2 +-
.../commons/jcs3/engine/ZombieCacheServiceNonLocalUnitTest.java | 2 +-
.../commons/jcs3/engine/control/CacheManagerStatsUnitTest.java | 2 +-
.../jcs3/engine/control/CompositeCacheConfiguratorUnitTest.java | 2 +-
.../jcs3/engine/control/CompositeCacheDiskUsageUnitTest.java | 2 +-
.../commons/jcs3/engine/control/CompositeCacheManagerTest.java | 2 +-
.../commons/jcs3/engine/control/CompositeCacheUnitTest.java | 2 +-
.../commons/jcs3/engine/control/MockCompositeCacheManager.java | 2 +-
.../apache/commons/jcs3/engine/control/MockElementSerializer.java | 2 +-
.../jcs3/engine/control/event/ElementEventHandlerMockImpl.java | 2 +-
.../jcs3/engine/control/event/SimpleEventHandlingUnitTest.java | 2 +-
.../jcs3/engine/logging/CacheEventLoggerDebugLoggerUnitTest.java | 2 +-
.../apache/commons/jcs3/engine/logging/MockCacheEventLogger.java | 2 +-
.../commons/jcs3/engine/match/KeyMatcherPatternImpllUnitTest.java | 2 +-
.../org/apache/commons/jcs3/engine/memory/MockMemoryCache.java | 2 +-
.../commons/jcs3/engine/memory/fifo/FIFOMemoryCacheUnitTest.java | 2 +-
.../engine/memory/lru/LHMLRUMemoryCacheConcurrentUnitTest.java | 2 +-
.../commons/jcs3/engine/memory/lru/LHMLRUMemoryCacheUnitTest.java | 2 +-
.../jcs3/engine/memory/lru/LRUMemoryCacheConcurrentUnitTest.java | 2 +-
.../commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java | 2 +-
.../commons/jcs3/engine/memory/mru/MRUMemoryCacheUnitTest.java | 2 +-
.../jcs3/engine/memory/shrinking/ShrinkerThreadUnitTest.java | 2 +-
.../jcs3/engine/memory/soft/SoftReferenceMemoryCacheUnitTest.java | 2 +-
.../test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java | 2 +-
.../org/apache/commons/jcs3/utils/access/JCSWorkerUnitTest.java | 2 +-
.../apache/commons/jcs3/utils/config/PropertySetterUnitTest.java | 2 +-
.../commons/jcs3/utils/discovery/MockDiscoveryListener.java | 2 +-
.../jcs3/utils/discovery/UDPDiscoverySenderEncryptedUnitTest.java | 2 +-
.../commons/jcs3/utils/discovery/UDPDiscoverySenderUnitTest.java | 2 +-
.../commons/jcs3/utils/discovery/UDPDiscoveryServiceUnitTest.java | 2 +-
.../apache/commons/jcs3/utils/discovery/UDPDiscoveryUnitTest.java | 2 +-
.../org/apache/commons/jcs3/utils/net/HostNameUtilUnitTest.java | 2 +-
.../java/org/apache/commons/jcs3/utils/props/PropertyLoader.java | 2 +-
.../jcs3/utils/serialization/CompressingSerializerUnitTest.java | 2 +-
.../jcs3/utils/serialization/EncryptingSerializerUnitTest.java | 2 +-
.../utils/serialization/SerializationConversionUtilUnitTest.java | 2 +-
.../commons/jcs3/utils/serialization/SerializerUnitTest.java | 2 +-
.../jcs3/utils/serialization/StandardSerializerUnitTest.java | 2 +-
.../commons/jcs3/utils/struct/DoubleLinkedListDumpUnitTest.java | 2 +-
.../commons/jcs3/utils/struct/DoubleLinkedListUnitTest.java | 2 +-
.../jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java | 2 +-
.../commons/jcs3/utils/struct/LRUMapConcurrentUnitTest.java | 2 +-
.../apache/commons/jcs3/utils/struct/LRUMapPerformanceTest.java | 2 +-
.../java/org/apache/commons/jcs3/utils/struct/LRUMapUnitTest.java | 2 +-
.../commons/jcs3/utils/threadpool/ThreadPoolManagerUnitTest.java | 2 +-
.../test/java/org/apache/commons/jcs3/utils/timing/SleepUtil.java | 2 +-
.../apache/commons/jcs3/utils/zip/CompressionUtilUnitTest.java | 2 +-
commons-jcs3-core/src/test/test-conf/TestARCCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestBDBJEDiskCacheCon.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestBlockDiskCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestBlockDiskCacheCon.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestBlockDiskCacheHuge.ccf | 2 +-
.../src/test/test-conf/TestBlockDiskCacheSteadyLoad.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestDiskCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestDiskCacheCon.ccf | 2 +-
.../src/test/test-conf/TestDiskCacheDefragPerformance.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestDiskCacheHuge.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestDiskCacheNoMemory.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestDiskCacheSteadyLoad.ccf | 2 +-
.../src/test/test-conf/TestDiskCacheUsagePattern.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestElementSerializer.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestHSQLDiskCache.ccf | 2 +-
.../src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJCS-73.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJCSvHashtablePerf.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJDBCDiskCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf | 2 +-
.../src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestJispDiskCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestLHMLRUCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestMRUCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestMySQLDiskCache.ccf | 2 +-
.../src/test/test-conf/TestRemoteCacheClientServer.ccf | 2 +-
.../src/test/test-conf/TestRemoteCacheEventLogging.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestRemoteCacheServer.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestRemoteClient.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestRemoteHttpCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestRemoteServer.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestRemoval.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestSimpleEventHandling.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestSimpleLoad.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestSoftReferenceCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestSystemProperties.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestSystemPropertyUsage.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestTCPLateralCache.ccf | 2 +-
.../src/test/test-conf/TestTCPLateralCacheConcurrent.ccf | 2 +-
.../src/test/test-conf/TestTCPLateralIssueRemoveCache.ccf | 2 +-
.../src/test/test-conf/TestTCPLateralRemoveFilter.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestThrash.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestUDPDiscovery.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/TestZeroSizeCache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/cache.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/cache2.ccf | 2 +-
commons-jcs3-core/src/test/test-conf/logging.properties | 2 +-
commons-jcs3-core/src/test/test-conf/thread_pool.properties | 2 +-
commons-jcs3-dist/pom.xml | 2 +-
commons-jcs3-dist/src/assembly/bin.xml | 2 +-
commons-jcs3-dist/src/assembly/src.xml | 2 +-
commons-jcs3-jcache-extras/pom.xml | 4 ++--
.../org/apache/commons/jcs3/jcache/extras/cdi/AnyLiteral.java | 2 +-
.../apache/commons/jcs3/jcache/extras/cdi/CacheManagerBean.java | 2 +-
.../apache/commons/jcs3/jcache/extras/cdi/CacheProviderBean.java | 2 +-
.../org/apache/commons/jcs3/jcache/extras/cdi/DefaultLiteral.java | 2 +-
.../commons/jcs3/jcache/extras/cdi/ExtraJCacheExtension.java | 2 +-
.../apache/commons/jcs3/jcache/extras/closeable/Closeables.java | 2 +-
.../commons/jcs3/jcache/extras/loader/CacheLoaderAdapter.java | 2 +-
.../commons/jcs3/jcache/extras/loader/CompositeCacheLoader.java | 2 +-
.../apache/commons/jcs3/jcache/extras/web/InMemoryResponse.java | 2 +-
.../org/apache/commons/jcs3/jcache/extras/web/JCacheFilter.java | 2 +-
.../commons/jcs3/jcache/extras/writer/AsyncCacheWriter.java | 2 +-
.../commons/jcs3/jcache/extras/writer/CacheWriterAdapter.java | 2 +-
.../commons/jcs3/jcache/extras/writer/CompositeCacheWriter.java | 2 +-
.../META-INF/services/javax.enterprise.inject.spi.Extension | 2 +-
.../apache/commons/jcs3/jcache/extras/InternalCacheExtension.java | 2 +-
.../commons/jcs3/jcache/extras/cdi/ExtraJCacheExtensionTest.java | 2 +-
.../commons/jcs3/jcache/extras/loader/CacheLoaderAdapterTest.java | 2 +-
.../jcs3/jcache/extras/loader/CompositeCacheLoaderTest.java | 2 +-
.../apache/commons/jcs3/jcache/extras/web/JCacheFilterTest.java | 2 +-
.../commons/jcs3/jcache/extras/writer/CacheWriterAdapterTest.java | 2 +-
.../jcs3/jcache/extras/writer/CompositeCacheWriterTest.java | 2 +-
commons-jcs3-jcache-extras/src/test/resources/META-INF/beans.xml | 2 +-
commons-jcs3-jcache-openjpa/pom.xml | 2 +-
.../commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCache.java | 2 +-
.../jcs3/jcache/openjpa/OpenJPAJCacheDataCacheManager.java | 2 +-
.../commons/jcs3/jcache/openjpa/OpenJPAJCacheDerivation.java | 2 +-
.../commons/jcs3/jcache/openjpa/OpenJPAJCacheQueryCache.java | 2 +-
.../services/org.apache.openjpa.lib.conf.ProductDerivation | 2 +-
.../commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java | 2 +-
commons-jcs3-jcache-tck/pom.xml | 2 +-
commons-jcs3-jcache-tck/run-tck.sh | 2 +-
.../commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java | 2 +-
.../test/java/org/apache/commons/jcs3/jcache/OWBBeanProvider.java | 2 +-
commons-jcs3-jcache-tck/src/test/resources/ExcludeList | 2 +-
.../META-INF/services/javax.cache.annotation.BeanProvider | 2 +-
commons-jcs3-jcache/pom.xml | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/Asserts.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/EvictionListener.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/ExpiryAwareCache.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/ImmutableIterable.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/ImmutableIterator.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/JCSCache.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/JCSCacheEntryEvent.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/JCSCachingManager.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/JCSCachingProvider.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/JCSConfiguration.java | 4 ++--
.../src/main/java/org/apache/commons/jcs3/jcache/JCSEntry.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/JCSListener.java | 2 +-
.../main/java/org/apache/commons/jcs3/jcache/JCSMutableEntry.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/NoFilter.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/NoLoader.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/NoWriter.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/Statistics.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/TempStateCacheView.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/Times.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelper.java | 2 +-
.../commons/jcs3/jcache/cdi/CacheInvocationContextImpl.java | 2 +-
.../commons/jcs3/jcache/cdi/CacheInvocationParameterImpl.java | 2 +-
.../org/apache/commons/jcs3/jcache/cdi/CacheKeyGeneratorImpl.java | 2 +-
.../commons/jcs3/jcache/cdi/CacheKeyInvocationContextImpl.java | 2 +-
.../apache/commons/jcs3/jcache/cdi/CacheMethodDetailsImpl.java | 2 +-
.../org/apache/commons/jcs3/jcache/cdi/CachePutInterceptor.java | 2 +-
.../apache/commons/jcs3/jcache/cdi/CacheRemoveAllInterceptor.java | 2 +-
.../apache/commons/jcs3/jcache/cdi/CacheRemoveInterceptor.java | 2 +-
.../apache/commons/jcs3/jcache/cdi/CacheResolverFactoryImpl.java | 2 +-
.../org/apache/commons/jcs3/jcache/cdi/CacheResolverImpl.java | 2 +-
.../apache/commons/jcs3/jcache/cdi/CacheResultInterceptor.java | 2 +-
.../org/apache/commons/jcs3/jcache/cdi/GeneratedCacheKeyImpl.java | 2 +-
.../commons/jcs3/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java | 2 +-
.../commons/jcs3/jcache/jmx/ConfigurableMBeanServerIdBuilder.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/jmx/JCSCacheMXBean.java | 2 +-
.../apache/commons/jcs3/jcache/jmx/JCSCacheStatisticsMXBean.java | 2 +-
.../src/main/java/org/apache/commons/jcs3/jcache/jmx/JMXs.java | 2 +-
.../org/apache/commons/jcs3/jcache/lang/DefaultSubsitutor.java | 2 +-
.../org/apache/commons/jcs3/jcache/lang/Lang3Substitutor.java | 2 +-
.../main/java/org/apache/commons/jcs3/jcache/lang/Subsitutor.java | 2 +-
.../apache/commons/jcs3/jcache/proxy/ClassLoaderAwareCache.java | 2 +-
.../apache/commons/jcs3/jcache/proxy/ExceptionWrapperHandler.java | 2 +-
.../apache/commons/jcs3/jcache/serialization/Serializations.java | 2 +-
.../apache/commons/jcs3/jcache/thread/DaemonThreadFactory.java | 2 +-
.../resources/META-INF/services/javax.cache.spi.CachingProvider | 2 +-
.../META-INF/services/javax.enterprise.inject.spi.Extension | 2 +-
.../src/test/java/org/apache/commons/jcs3/jcache/CacheTest.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/CachingProviderTest.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/ExpiryListenerTest.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/ImmediateExpiryTest.java | 2 +-
.../java/org/apache/commons/jcs3/jcache/NotSerializableTest.java | 2 +-
.../org/apache/commons/jcs3/jcache/cdi/CDIJCacheHelperTest.java | 2 +-
commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml | 2 +-
.../org/apache/commons/jcs/auxiliary/disk/file/FileDiskCache.java | 4 ++--
.../commons/jcs/auxiliary/disk/file/FileDiskCacheAttributes.java | 2 +-
.../commons/jcs/auxiliary/disk/file/FileDiskCacheFactory.java | 2 +-
.../commons/jcs/auxiliary/disk/file/FileDiskCacheManager.java | 4 ++--
.../jcs/auxiliary/disk/file/FileDiskCacheFactoryUnitTest.java | 2 +-
.../commons/jcs/auxiliary/disk/file/FileDiskCacheUnitTest.java | 2 +-
.../org/apache/commons/jcs/access/PartitionedCacheAccess.java | 2 +-
.../apache/commons/jcs/utils/props/AbstractPropertyContainer.java | 2 +-
.../org/apache/commons/jcs/utils/props/PropertiesFactory.java | 2 +-
.../apache/commons/jcs/utils/props/PropertiesFactoryFileImpl.java | 2 +-
commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml | 4 ++--
.../org/apache/commons/jcs/yajcache/beans/CacheChangeEvent.java | 2 +-
.../org/apache/commons/jcs/yajcache/beans/CacheChangeSupport.java | 2 +-
.../org/apache/commons/jcs/yajcache/beans/CacheClearEvent.java | 2 +-
.../apache/commons/jcs/yajcache/beans/CachePutBeanCloneEvent.java | 2 +-
.../apache/commons/jcs/yajcache/beans/CachePutBeanCopyEvent.java | 2 +-
.../org/apache/commons/jcs/yajcache/beans/CachePutCopyEvent.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/beans/CachePutEvent.java | 2 +-
.../org/apache/commons/jcs/yajcache/beans/CacheRemoveEvent.java | 2 +-
.../apache/commons/jcs/yajcache/beans/ICacheChangeHandler.java | 2 +-
.../apache/commons/jcs/yajcache/beans/ICacheChangeListener.java | 2 +-
.../org/apache/commons/jcs/yajcache/config/PerCacheConfig.java | 2 +-
.../org/apache/commons/jcs/yajcache/config/YajCacheConfig.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/core/CacheEntry.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/core/CacheManager.java | 2 +-
.../main/java/org/apache/commons/jcs/yajcache/core/CacheType.java | 2 +-
.../main/java/org/apache/commons/jcs/yajcache/core/ICache.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/core/ICacheSafe.java | 2 +-
.../org/apache/commons/jcs/yajcache/core/SafeCacheWrapper.java | 2 +-
.../org/apache/commons/jcs/yajcache/file/CacheFileContent.java | 2 +-
.../commons/jcs/yajcache/file/CacheFileContentCorrupted.java | 2 +-
.../apache/commons/jcs/yajcache/file/CacheFileContentType.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/file/CacheFileDAO.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/file/CacheFileUtils.java | 2 +-
.../commons/jcs/yajcache/lang/annotation/CopyRightApache.java | 2 +-
.../commons/jcs/yajcache/lang/annotation/CopyRightType.java | 4 ++--
.../apache/commons/jcs/yajcache/lang/annotation/Immutable.java | 2 +-
.../apache/commons/jcs/yajcache/lang/annotation/Implements.java | 2 +-
.../org/apache/commons/jcs/yajcache/lang/annotation/JavaBean.java | 2 +-
.../apache/commons/jcs/yajcache/lang/annotation/NonNullable.java | 2 +-
.../org/apache/commons/jcs/yajcache/lang/annotation/TODO.java | 2 +-
.../org/apache/commons/jcs/yajcache/lang/annotation/TestOnly.java | 2 +-
.../apache/commons/jcs/yajcache/lang/annotation/ThreadSafety.java | 2 +-
.../commons/jcs/yajcache/lang/annotation/ThreadSafetyType.java | 2 +-
.../jcs/yajcache/lang/annotation/UnsupportedOperation.java | 2 +-
.../main/java/org/apache/commons/jcs/yajcache/lang/ref/IKey.java | 2 +-
.../apache/commons/jcs/yajcache/lang/ref/KeyedRefCollector.java | 2 +-
.../apache/commons/jcs/yajcache/lang/ref/KeyedSoftReference.java | 2 +-
.../apache/commons/jcs/yajcache/lang/ref/KeyedWeakReference.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/soft/SoftRefCache.java | 2 +-
.../org/apache/commons/jcs/yajcache/soft/SoftRefFileCache.java | 2 +-
.../main/java/org/apache/commons/jcs/yajcache/util/BeanUtils.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/util/ClassUtils.java | 2 +-
.../org/apache/commons/jcs/yajcache/util/CollectionUtils.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/util/EqualsUtils.java | 2 +-
.../java/org/apache/commons/jcs/yajcache/util/SerializeUtils.java | 2 +-
.../jcs/yajcache/util/concurrent/locks/IKeyedReadWriteLock.java | 2 +-
.../jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java | 2 +-
.../org/apache/commons/jcs/yajcache/core/CacheManagerTest.java | 2 +-
.../apache/commons/jcs/yajcache/core/SafeCacheManagerTest.java | 2 +-
.../org/apache/commons/jcs/yajcache/file/CacheFileDAOTest.java | 2 +-
.../org/apache/commons/jcs/yajcache/file/FileContentTypeTest.java | 2 +-
.../commons/jcs/yajcache/lang/annotation/CopyRightApacheTest.java | 2 +-
.../org/apache/commons/jcs/yajcache/soft/SoftRefCacheTest.java | 2 +-
.../commons/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java | 2 +-
.../org/apache/commons/jcs/yajcache/util/SerializeUtilsTest.java | 2 +-
.../org/apache/commons/jcs/yajcache/util/TestSerializable.java | 2 +-
.../commons-jcs3-yajcache/src/test/resources/log4j2.xml | 2 +-
commons-jcs3-sandbox/pom.xml | 2 +-
init-git-svn.sh | 2 +-
jcache-fast.sh | 2 +-
maven-eclipse-codestyle.xml | 2 +-
pom.xml | 4 ++--
src/changes/changes.xml | 8 ++++----
src/changes/release-notes.vm | 4 ++--
.../auxiliary/lateral/http/broadcast/LateralCacheMulticaster.java | 2 +-
.../jcs/auxiliary/lateral/http/broadcast/LateralCacheThread.java | 2 +-
.../auxiliary/lateral/http/broadcast/LateralCacheUnicaster.java | 2 +-
.../lateral/http/remove/DeleteLateralCacheMulticaster.java | 2 +-
.../lateral/http/remove/DeleteLateralCacheUnicaster.java | 2 +-
.../auxiliary/lateral/http/server/AbstractDeleteCacheServlet.java | 2 +-
.../jcs/auxiliary/lateral/http/server/DeleteCacheServlet.java | 2 +-
.../lateral/http/server/LateralCacheServletReciever.java | 2 +-
.../jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java | 2 +-
.../lateral/socket/udp/LateralGroupCacheUDPListener.java | 2 +-
.../jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java | 2 +-
.../jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java | 2 +-
.../jcs/auxiliary/lateral/socket/udp/LateralUDPService.java | 2 +-
.../jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java | 2 +-
.../auxiliary/lateral/xmlrpc/LateralGroupCacheXMLRPCListener.java | 2 +-
.../jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiver.java | 2 +-
.../auxiliary/lateral/xmlrpc/LateralXMLRPCReceiverConnection.java | 2 +-
.../commons/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java | 2 +-
.../jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java | 2 +-
.../lateral/xmlrpc/behavior/ILateralCacheXMLRPCListener.java | 2 +-
.../jcs/auxiliary/lateral/xmlrpc/behavior/IXMLRPCConstants.java | 2 +-
.../jcs/auxiliary/lateral/xmlrpc/utils/XMLRPCSocketOpener.java | 2 +-
.../org/apache/commons/jcs/engine/memory/arc/ARCMemoryCache.java | 2 +-
.../commons/jcs/engine/memory/arc/ARCMemoryCacheUnitTest.java | 2 +-
src/scripts/cpappend.bat | 2 +-
src/scripts/directory.bat | 2 +-
src/scripts/jgtest.bat | 2 +-
src/scripts/jgtest_send.bat | 2 +-
src/scripts/jgtest_send.sh | 2 +-
src/scripts/prep.bat | 2 +-
src/scripts/remoteCacheStats.bat | 2 +-
src/scripts/remoteCacheStats.sh | 2 +-
src/scripts/setCURDIR.bat | 2 +-
src/scripts/startJetty.bat | 2 +-
src/scripts/startRemoteCache.bat | 2 +-
src/scripts/startRemoteCache.sh | 2 +-
src/scripts/stopRemoteCache.bat | 2 +-
src/scripts/tester.bat | 2 +-
src/scripts/tester.sh | 2 +-
src/site/resources/download_jcs.cgi | 2 +-
src/site/site.xml | 2 +-
xdocs/BDBJEDiskCache.ccf | 2 +-
xdocs/BasicJCSConfiguration.xml | 2 +-
xdocs/BlockDiskCache.xml | 2 +-
xdocs/CacheEventLogging.xml | 2 +-
xdocs/ElementAttributes.xml | 2 +-
xdocs/ElementEventHandling.xml | 2 +-
xdocs/ElementSerializers.xml | 2 +-
xdocs/IndexedDiskAuxCache.xml | 2 +-
xdocs/IndexedDiskCacheProperties.xml | 2 +-
xdocs/JCSPlugins.xml | 2 +-
xdocs/JCSShortDescription.xml | 2 +-
xdocs/JCSandJCACHE.xml | 2 +-
xdocs/JCSvsEHCache.xml | 2 +-
xdocs/JDBCDiskCache.xml | 2 +-
xdocs/JDBCDiskCacheProperties.xml | 2 +-
xdocs/LateralJavaGroupsAuxCache.xml | 2 +-
xdocs/LateralTCPAuxCache.xml | 2 +-
xdocs/LateralTCPProperties.xml | 2 +-
xdocs/LateralUDPDiscovery.xml | 2 +-
xdocs/LocalCacheConfig.xml | 2 +-
xdocs/MySQLDiskCacheProperties.xml | 2 +-
xdocs/ProjectHistory.xml | 2 +-
xdocs/RegionProperties.xml | 2 +-
xdocs/RemoteAuxCache.xml | 2 +-
xdocs/RemoteCacheProperties.xml | 2 +-
xdocs/RemoteHttpCacheProperties.xml | 2 +-
xdocs/UpgradingFrom13.xml | 2 +-
xdocs/UpgradingFrom2x.xml | 2 +-
xdocs/UsingJCSBasicWeb.xml | 2 +-
xdocs/download_jcs.xml | 2 +-
xdocs/faq.fml | 2 +-
xdocs/getting_started/intro.xml | 2 +-
xdocs/index.xml | 2 +-
xdocs/issue-tracking.xml | 2 +-
xdocs/mail-lists.xml | 2 +-
773 files changed, 791 insertions(+), 791 deletions(-)
(commons-jcs) 01/07: Move from javax to jakarta
Posted by tv...@apache.org.
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>