This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
The following commit(s) were added to refs/heads/master by this push:
new befefd14 Update jakarta.jakartaee-api to 11.0.0, openwebbeans-impl to
4.1.1,
befefd14 is described below
commit befefd14429c8e3d0cacdb129020791d34283120
Author: Thomas Vandahl <[email protected]>
AuthorDate: Thu Oct 1 21:17:42 2026 +0200
Update jakarta.jakartaee-api to 11.0.0, openwebbeans-impl to 4.1.1,
openjpa to 4.1.1
---
.../commons/jcs4/jcache/extras/cdi/AnyLiteral.java | 4 +-
.../jcs4/jcache/extras/cdi/CacheManagerBean.java | 17 +++-----
.../jcs4/jcache/extras/cdi/CacheProviderBean.java | 17 +++-----
.../jcs4/jcache/extras/cdi/DefaultLiteral.java | 4 +-
.../jcache/extras/cdi/ExtraJCacheExtension.java | 13 ++++---
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../extras/cdi/ExtraJCacheExtensionTest.java | 3 +-
.../jcs4/jcache/extras/web/JCacheFilterTest.java | 4 +-
commons-jcs4-jcache-openjpa/pom.xml | 2 +-
.../jcache/openjpa/OpenJPAJCacheDataCacheTest.java | 16 ++++----
.../commons/jcs4/jcache/OWBBeanProvider.java | 3 +-
.../commons/jcs4/jcache/cdi/CDIJCacheHelper.java | 15 ++++----
.../jcache/cdi/CacheInvocationContextImpl.java | 3 +-
.../jcache/cdi/CacheKeyInvocationContextImpl.java | 3 +-
.../jcs4/jcache/cdi/CacheMethodDetailsImpl.java | 3 +-
.../jcs4/jcache/cdi/CachePutInterceptor.java | 11 +++---
.../jcs4/jcache/cdi/CacheRemoveAllInterceptor.java | 11 +++---
.../jcs4/jcache/cdi/CacheRemoveInterceptor.java | 11 +++---
.../jcs4/jcache/cdi/CacheResultInterceptor.java | 11 +++---
.../cdi/MakeJCacheCDIInterceptorFriendly.java | 45 +++++++++++-----------
...ion => jakarta.enterprise.inject.spi.Extension} | 0
.../jcs4/jcache/cdi/CDIJCacheHelperTest.java | 3 +-
pom.xml | 4 +-
src/changes/changes.xml | 13 +++----
24 files changed, 107 insertions(+), 109 deletions(-)
diff --git
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/AnyLiteral.java
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/AnyLiteral.java
index 9365997e..f02a46d2 100644
---
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/AnyLiteral.java
+++
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/AnyLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.commons.jcs4.jcache.extras.cdi;
-import javax.enterprise.inject.Any;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.util.AnnotationLiteral;
public class AnyLiteral extends AnnotationLiteral<Any> implements Any
{
diff --git
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheManagerBean.java
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheManagerBean.java
index d4e20bb6..b88ee477 100644
---
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheManagerBean.java
+++
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheManagerBean.java
@@ -26,11 +26,12 @@ import java.util.HashSet;
import java.util.Set;
import javax.cache.CacheManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
public class CacheManagerBean implements Bean<CacheManager>, PassivationCapable
{
@@ -118,10 +119,4 @@ public class CacheManagerBean implements
Bean<CacheManager>, PassivationCapable
{
return false;
}
-
- @Override
- public boolean isNullable()
- {
- return false;
- }
}
diff --git
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheProviderBean.java
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheProviderBean.java
index e4e55221..77219b1d 100644
---
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheProviderBean.java
+++
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/CacheProviderBean.java
@@ -26,11 +26,12 @@ import java.util.HashSet;
import java.util.Set;
import javax.cache.spi.CachingProvider;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
public class CacheProviderBean implements Bean<CachingProvider>,
PassivationCapable
{
@@ -118,10 +119,4 @@ public class CacheProviderBean implements
Bean<CachingProvider>, PassivationCapa
{
return false;
}
-
- @Override
- public boolean isNullable()
- {
- return false;
- }
}
diff --git
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/DefaultLiteral.java
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/DefaultLiteral.java
index d2eee749..a92f2089 100644
---
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/DefaultLiteral.java
+++
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/DefaultLiteral.java
@@ -18,8 +18,8 @@
*/
package org.apache.commons.jcs4.jcache.extras.cdi;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.AnnotationLiteral;
public class DefaultLiteral extends AnnotationLiteral<Default> implements
Default
{
diff --git
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtension.java
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtension.java
index 684fe1a3..31ed15a8 100644
---
a/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtension.java
+++
b/commons-jcs4-jcache-extras/src/main/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtension.java
@@ -23,12 +23,13 @@ import java.util.Properties;
import javax.cache.CacheManager;
import javax.cache.Caching;
import javax.cache.spi.CachingProvider;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeforeShutdown;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessBean;
+
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeforeShutdown;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessBean;
// add default CacheProvider and CacheManager
public class ExtraJCacheExtension implements Extension
diff --git
a/commons-jcs4-jcache-extras/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/commons-jcs4-jcache-extras/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from
commons-jcs4-jcache-extras/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to
commons-jcs4-jcache-extras/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git
a/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtensionTest.java
b/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtensionTest.java
index 711bbdba..3a65bf40 100644
---
a/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtensionTest.java
+++
b/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/cdi/ExtraJCacheExtensionTest.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import javax.cache.CacheManager;
import javax.cache.spi.CachingProvider;
-import javax.inject.Inject;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
@@ -33,6 +32,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import jakarta.inject.Inject;
+
class ExtraJCacheExtensionTest
{
public static class BeanWithInjections {
diff --git
a/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/web/JCacheFilterTest.java
b/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/web/JCacheFilterTest.java
index ddb45c53..e108f126 100644
---
a/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/web/JCacheFilterTest.java
+++
b/commons-jcs4-jcache-extras/src/test/java/org/apache/commons/jcs4/jcache/extras/web/JCacheFilterTest.java
@@ -107,7 +107,7 @@ class JCacheFilterTest
tomcat.start();
final Context ctx = tomcat.addContext("/sample",
docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "hello", Hello.class.getName());
- ctx.addServletMappingDecoded("/", "hello");
+ ctx.addServletMapping("/", "hello");
addJcsFilter(ctx);
StandardContext.class.cast(ctx).filterStart();
@@ -135,7 +135,7 @@ class JCacheFilterTest
tomcat.start();
final Context ctx = tomcat.addWebapp("/sample",
docBase.getAbsolutePath());
Tomcat.addServlet(ctx, "empty", Empty.class.getName());
- ctx.addServletMappingDecoded("/", "empty");
+ ctx.addServletMapping("/", "empty");
addJcsFilter(ctx);
StandardContext.class.cast(ctx).filterStart();
diff --git a/commons-jcs4-jcache-openjpa/pom.xml
b/commons-jcs4-jcache-openjpa/pom.xml
index fe07db8a..5e6f0ca6 100644
--- a/commons-jcs4-jcache-openjpa/pom.xml
+++ b/commons-jcs4-jcache-openjpa/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>3.2.2</version>
+ <version>4.1.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git
a/commons-jcs4-jcache-openjpa/src/test/java/org/apache/commons/jcs4/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
b/commons-jcs4-jcache-openjpa/src/test/java/org/apache/commons/jcs4/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
index ff107ffe..0e4ba6c3 100644
---
a/commons-jcs4-jcache-openjpa/src/test/java/org/apache/commons/jcs4/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
+++
b/commons-jcs4-jcache-openjpa/src/test/java/org/apache/commons/jcs4/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
@@ -26,14 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Map;
import java.util.Properties;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Persistence;
-import javax.persistence.Query;
-
import org.apache.derby.jdbc.EmbeddedDriver;
import org.apache.openjpa.conf.OpenJPAConfiguration;
import org.apache.openjpa.datacache.QueryKey;
@@ -41,6 +33,14 @@ import org.apache.openjpa.persistence.JPAFacadeHelper;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.junit.jupiter.api.Test;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Persistence;
+import jakarta.persistence.Query;
+
class OpenJPAJCacheDataCacheTest
{
@Entity
diff --git
a/commons-jcs4-jcache-tck/src/test/java/org/apache/commons/jcs4/jcache/OWBBeanProvider.java
b/commons-jcs4-jcache-tck/src/test/java/org/apache/commons/jcs4/jcache/OWBBeanProvider.java
index a95a5efc..3604c31d 100644
---
a/commons-jcs4-jcache-tck/src/test/java/org/apache/commons/jcs4/jcache/OWBBeanProvider.java
+++
b/commons-jcs4-jcache-tck/src/test/java/org/apache/commons/jcs4/jcache/OWBBeanProvider.java
@@ -21,12 +21,13 @@ package org.apache.commons.jcs4.jcache;
import java.util.Set;
import javax.cache.annotation.BeanProvider;
-import javax.enterprise.inject.spi.Bean;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.spi.ContainerLifecycle;
+import jakarta.enterprise.inject.spi.Bean;
+
public class OWBBeanProvider implements BeanProvider
{
private final BeanManagerImpl bm;
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelper.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelper.java
index ea7d6f96..48e48200 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelper.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelper.java
@@ -32,7 +32,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.logging.Logger;
-import javax.annotation.PreDestroy;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKey;
import javax.cache.annotation.CacheKeyGenerator;
@@ -42,12 +41,14 @@ import javax.cache.annotation.CacheRemoveAll;
import javax.cache.annotation.CacheResolverFactory;
import javax.cache.annotation.CacheResult;
import javax.cache.annotation.CacheValue;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
@ApplicationScoped
public class CDIJCacheHelper
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheInvocationContextImpl.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheInvocationContextImpl.java
index 46ea85f6..54c3d546 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheInvocationContextImpl.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheInvocationContextImpl.java
@@ -24,7 +24,8 @@ import java.util.Set;
import javax.cache.annotation.CacheInvocationContext;
import javax.cache.annotation.CacheInvocationParameter;
-import javax.interceptor.InvocationContext;
+
+import jakarta.interceptor.InvocationContext;
public class CacheInvocationContextImpl<A extends Annotation> extends
CacheMethodDetailsImpl<A> implements CacheInvocationContext<A>
{
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheKeyInvocationContextImpl.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheKeyInvocationContextImpl.java
index 6e374876..afe27e56 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheKeyInvocationContextImpl.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheKeyInvocationContextImpl.java
@@ -22,7 +22,8 @@ import java.lang.annotation.Annotation;
import javax.cache.annotation.CacheInvocationParameter;
import javax.cache.annotation.CacheKeyInvocationContext;
-import javax.interceptor.InvocationContext;
+
+import jakarta.interceptor.InvocationContext;
public class CacheKeyInvocationContextImpl<A extends Annotation> extends
CacheInvocationContextImpl<A> implements CacheKeyInvocationContext<A>
{
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheMethodDetailsImpl.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheMethodDetailsImpl.java
index bdc81968..ddcb0a6f 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheMethodDetailsImpl.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheMethodDetailsImpl.java
@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
import java.util.Set;
import javax.cache.annotation.CacheMethodDetails;
-import javax.interceptor.InvocationContext;
+
+import jakarta.interceptor.InvocationContext;
public class CacheMethodDetailsImpl<A extends Annotation> implements
CacheMethodDetails<A>
{
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CachePutInterceptor.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CachePutInterceptor.java
index c166172f..cadfaebe 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CachePutInterceptor.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CachePutInterceptor.java
@@ -20,17 +20,18 @@ package org.apache.commons.jcs4.jcache.cdi;
import java.io.Serializable;
-import javax.annotation.Priority;
import javax.cache.Cache;
import javax.cache.annotation.CacheKeyInvocationContext;
import javax.cache.annotation.CachePut;
import javax.cache.annotation.CacheResolver;
import javax.cache.annotation.CacheResolverFactory;
import javax.cache.annotation.GeneratedCacheKey;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
@CachePut
@Interceptor
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveAllInterceptor.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveAllInterceptor.java
index e7db7c5e..f20bab85 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveAllInterceptor.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveAllInterceptor.java
@@ -20,16 +20,17 @@ package org.apache.commons.jcs4.jcache.cdi;
import java.io.Serializable;
-import javax.annotation.Priority;
import javax.cache.Cache;
import javax.cache.annotation.CacheKeyInvocationContext;
import javax.cache.annotation.CacheRemoveAll;
import javax.cache.annotation.CacheResolver;
import javax.cache.annotation.CacheResolverFactory;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
@CacheRemoveAll
@Interceptor
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveInterceptor.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveInterceptor.java
index d402c291..73871c7f 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveInterceptor.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheRemoveInterceptor.java
@@ -20,17 +20,18 @@ package org.apache.commons.jcs4.jcache.cdi;
import java.io.Serializable;
-import javax.annotation.Priority;
import javax.cache.Cache;
import javax.cache.annotation.CacheKeyInvocationContext;
import javax.cache.annotation.CacheRemove;
import javax.cache.annotation.CacheResolver;
import javax.cache.annotation.CacheResolverFactory;
import javax.cache.annotation.GeneratedCacheKey;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
@CacheRemove
@Interceptor
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheResultInterceptor.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheResultInterceptor.java
index 3a5f271c..7275c2a7 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheResultInterceptor.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/CacheResultInterceptor.java
@@ -20,17 +20,18 @@ package org.apache.commons.jcs4.jcache.cdi;
import java.io.Serializable;
-import javax.annotation.Priority;
import javax.cache.Cache;
import javax.cache.annotation.CacheKeyInvocationContext;
import javax.cache.annotation.CacheResolver;
import javax.cache.annotation.CacheResolverFactory;
import javax.cache.annotation.CacheResult;
import javax.cache.annotation.GeneratedCacheKey;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
@CacheResult
@Interceptor
diff --git
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java
index e2981505..e7290073 100644
---
a/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java
+++
b/commons-jcs4-jcache/src/main/java/org/apache/commons/jcs4/jcache/cdi/MakeJCacheCDIInterceptorFriendly.java
@@ -31,22 +31,24 @@ import javax.cache.annotation.CachePut;
import javax.cache.annotation.CacheRemove;
import javax.cache.annotation.CacheRemoveAll;
import javax.cache.annotation.CacheResult;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.util.AnnotationLiteral;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.util.AnnotationLiteral;
// TODO: observe annotated type (or maybe sthg else) to cache data and inject
this extension (used as metadata cache)
// to get class model and this way allow to add cache annotation on the fly -
== avoid java pure reflection to get metadata
@@ -137,11 +139,6 @@ public class MakeJCacheCDIInterceptorFriendly implements
Extension
public boolean isAlternative() {
return false;
}
-
- @Override
- public boolean isNullable() {
- return false;
- }
}
private static final AtomicInteger id = new AtomicInteger();
@@ -176,7 +173,8 @@ public class MakeJCacheCDIInterceptorFriendly implements
Extension
});
*/
final AnnotatedType<CDIJCacheHelper> annotatedType =
bm.createAnnotatedType(CDIJCacheHelper.class);
- final InjectionTarget<CDIJCacheHelper> injectionTarget =
bm.createInjectionTarget(annotatedType);
+ final InjectionTargetFactory<CDIJCacheHelper> injectionTargetFactory =
bm.getInjectionTargetFactory(annotatedType);
+ final InjectionTarget<CDIJCacheHelper> injectionTarget =
injectionTargetFactory.createInjectionTarget(null);
final HelperBean bean = new HelperBean(annotatedType, injectionTarget,
findIdSuffix());
afterBeanDiscovery.addBean(bean);
}
@@ -203,7 +201,8 @@ public class MakeJCacheCDIInterceptorFriendly implements
Extension
for (final Class<?> interceptor : asList(
CachePutInterceptor.class, CacheRemoveInterceptor.class,
CacheRemoveAllInterceptor.class,
CacheResultInterceptor.class)) {
-
beforeBeanDiscoveryEvent.addAnnotatedType(bm.createAnnotatedType(interceptor));
+ AnnotatedType<?> annotatedType =
bm.createAnnotatedType(interceptor);
+ beforeBeanDiscoveryEvent.addAnnotatedType(annotatedType,
annotatedType.getJavaClass().getName());
}
for (final Class<? extends Annotation> interceptor : asList(
CachePut.class, CacheRemove.class,
diff --git
a/commons-jcs4-jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/commons-jcs4-jcache/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from
commons-jcs4-jcache/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to
commons-jcs4-jcache/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git
a/commons-jcs4-jcache/src/test/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelperTest.java
b/commons-jcs4-jcache/src/test/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelperTest.java
index a75d411f..f55636e1 100644
---
a/commons-jcs4-jcache/src/test/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelperTest.java
+++
b/commons-jcs4-jcache/src/test/java/org/apache/commons/jcs4/jcache/cdi/CDIJCacheHelperTest.java
@@ -29,10 +29,11 @@ import java.util.Map;
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheResult;
-import javax.interceptor.InvocationContext;
import org.junit.jupiter.api.Test;
+import jakarta.interceptor.InvocationContext;
+
class CDIJCacheHelperTest
{
@CacheDefaults(cacheName = "child")
diff --git a/pom.xml b/pom.xml
index 18ab74e0..83663742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,7 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
- <version>8.0.0</version>
+ <version>11.0.0</version>
<exclusions>
<exclusion>
<groupId>com.sun.mail</groupId>
@@ -375,7 +375,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.27</version>
+ <version>4.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5b8bf805..1364a5ee 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -79,11 +79,6 @@
<action dev="tv" type="remove">
Remove setters from interfaces of Attributes containers
</action>
- <action dev="tv" type="remove">
- Remove synchronized from all methods of DoubleLinkedList
because their
- usage is guarded by external locks (double locking). Document
the
- behavior.
- </action>
<!-- UPDATE -->
<action dev="tv" type="update">
Introduce java.time.Duration for all time-related configuration
parameters
@@ -103,8 +98,10 @@
<action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Bump org.apache.commons:commons-parent from 59 to 105 #222, #258,
#277, #280, #286, #292, #296, #302, #352, #305, #403, #404.</action>
<action dev="tv" type="update" issue="JCS-241">Use System.Logger
from Java9, remove own logging abstraction, remove dependency on log4j2</action>
<action dev="tv" type="update" due-to="Gary Gregory,
strangelookingnerd">Migrate tests to JUnit5 #309</action>
- <action dev="tv" type="update">Update dependency servlet-api 2.5
to javax.servlet-api 3.1.0.</action>
- <action dev="tv" type="update">Update dependency openwebbeans-impl
1.7.6 to 2.0.27.</action>
+ <action dev="tv" type="update">Update dependency servlet-api 2.5
to javax.servlet-api 6.1.0.</action>
+ <action dev="tv" type="update">Update dependency
jakarta.jakartaee-api 8.0.0 to 11.0.0.</action>
+ <action dev="tv" type="update">Update dependency openwebbeans-impl
1.7.6 to 4.1.1.</action>
+ <action dev="tv" type="update">Update dependency openjpa 3.2.2 to
4.1.1.</action>
<action dev="tv" type="update">Update dependency cache-tests 1.0.1
to 1.1.1.</action>
<action dev="tv" type="update">Update Tomcat libraries 7.0.22 to
11.0.22.</action>
<action dev="tv" type="update">Bump Java to 17.</action>
@@ -122,7 +119,7 @@
<action type="update" dev="ggregory" due-to="Gary Gregory">[test]
Bump org.apache.commons:commons-collections4 from 4.4 to 4.6.0.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-beanutils:commons-beanutils from 1.9.4 to 1.11.0.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-io:commons-io from 2.18.0 to 2.22.0.</action>
- <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
com.fasterxml.jackson.core:jackson-databind from 2.21.1 to 2.21.5.</action>
+ <action type="update" dev="ggregory" due-to="Gary Gregory">Bump
com.fasterxml.jackson.core:jackson-databind from 2.21.1 to 2.22.6.</action>
</release>
<release version="3.2.1" date="2024-05-27" description="JDK bug fix
release">
<action dev="tv" type="fix" fixed-issues="JCS-237, JCS-238,
JCS-239, JCS-240" due-to="Murali Thirugnanam, Greg Parmiter">
