From 4f2f1737d9a6c70fd9022509474e618d2ecd0dc5 Mon Sep 17 00:00:00 2001
From: Fabian Franz BSc <fabian.franz@inet-logistics.com>
Date: Mon, 2 Jan 2023 15:41:50 +0100
Subject: [PATCH 1/2] Support for Spring 6 / Jakarta EE 9/10

---
 cache-annotations-ri/cache-annotations-ri-cdi/pom.xml     | 4 ++--
 .../org/jsr107/ri/annotations/cdi/BeanManagerUtil.java    | 8 ++++----
 .../org/jsr107/ri/annotations/cdi/CacheLookupUtil.java    | 4 ++--
 .../jsr107/ri/annotations/cdi/CachePutInterceptor.java    | 8 ++++----
 .../ri/annotations/cdi/CacheRemoveAllInterceptor.java     | 8 ++++----
 .../ri/annotations/cdi/CacheRemoveEntryInterceptor.java   | 8 ++++----
 .../jsr107/ri/annotations/cdi/CacheResultInterceptor.java | 8 ++++----
 .../ri/annotations/cdi/CdiCacheInvocationContextImpl.java | 2 +-
 .../annotations/cdi/CdiCacheKeyInvocationContextImpl.java | 2 +-
 .../jsr107/ri/annotations/cdi/InterceptorExtension.java   | 6 +++---
 ....Extension => jakarta.enterprise.inject.spi.Extension} | 0
 cache-annotations-ri/cache-annotations-ri-spring/pom.xml  | 2 +-
 cache-ri-impl/pom.xml                                     | 4 ++--
 pom.xml                                                   | 6 +++---
 14 files changed, 35 insertions(+), 35 deletions(-)
 rename cache-annotations-ri/cache-annotations-ri-cdi/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%)

diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml b/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
index 9d776ee..2e2f972 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
@@ -28,8 +28,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/BeanManagerUtil.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/BeanManagerUtil.java
index 5b4a19f..fe56f37 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/BeanManagerUtil.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/BeanManagerUtil.java
@@ -16,10 +16,10 @@
  */
 package org.jsr107.ri.annotations.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheLookupUtil.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheLookupUtil.java
index 766494a..296262d 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheLookupUtil.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheLookupUtil.java
@@ -26,8 +26,8 @@
 
 import javax.cache.annotation.CacheKeyGenerator;
 import javax.cache.annotation.CacheResolverFactory;
-import javax.inject.Inject;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.InvocationContext;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CachePutInterceptor.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CachePutInterceptor.java
index 002de5e..88b1bb0 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CachePutInterceptor.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CachePutInterceptor.java
@@ -20,10 +20,10 @@
 import org.jsr107.ri.annotations.AbstractCachePutInterceptor;
 
 import javax.cache.annotation.CachePut;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 
 /**
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveAllInterceptor.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveAllInterceptor.java
index a917145..3493ef4 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveAllInterceptor.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveAllInterceptor.java
@@ -20,10 +20,10 @@
 import org.jsr107.ri.annotations.AbstractCacheRemoveAllInterceptor;
 
 import javax.cache.annotation.CacheRemoveAll;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 
 /**
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveEntryInterceptor.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveEntryInterceptor.java
index bf95104..27e9e55 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveEntryInterceptor.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveEntryInterceptor.java
@@ -20,10 +20,10 @@
 import org.jsr107.ri.annotations.AbstractCacheRemoveEntryInterceptor;
 
 import javax.cache.annotation.CacheRemove;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 
 /**
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheResultInterceptor.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheResultInterceptor.java
index 14df885..f3ccefc 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheResultInterceptor.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheResultInterceptor.java
@@ -20,10 +20,10 @@
 import org.jsr107.ri.annotations.AbstractCacheResultInterceptor;
 
 import javax.cache.annotation.CacheResult;
-import javax.inject.Inject;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 
 /**
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheInvocationContextImpl.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheInvocationContextImpl.java
index c2d9521..f13949a 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheInvocationContextImpl.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheInvocationContextImpl.java
@@ -20,7 +20,7 @@
 import org.jsr107.ri.annotations.AbstractInternalCacheInvocationContext;
 import org.jsr107.ri.annotations.StaticCacheInvocationContext;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheKeyInvocationContextImpl.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheKeyInvocationContextImpl.java
index e7a2a9c..bdd1aec 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheKeyInvocationContextImpl.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheKeyInvocationContextImpl.java
@@ -20,7 +20,7 @@
 import org.jsr107.ri.annotations.AbstractInternalCacheKeyInvocationContext;
 import org.jsr107.ri.annotations.StaticCacheKeyInvocationContext;
 
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/InterceptorExtension.java b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/InterceptorExtension.java
index 7fe652f..c3c4262 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/InterceptorExtension.java
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/InterceptorExtension.java
@@ -20,9 +20,9 @@
 import javax.cache.annotation.CacheRemove;
 import javax.cache.annotation.CacheRemoveAll;
 import javax.cache.annotation.CacheResult;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
 
 /**
  * Service interface implemented by extensions. An extension is a service provider declared in META-INF/services.
diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/cache-annotations-ri/cache-annotations-ri-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from cache-annotations-ri/cache-annotations-ri-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to cache-annotations-ri/cache-annotations-ri-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/cache-annotations-ri/cache-annotations-ri-spring/pom.xml b/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
index 2f788ba..8feba78 100644
--- a/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>3.2.18.RELEASE</spring.version>
+        <spring.version>6.0.0</spring.version>
     </properties>
 
     <dependencies>
diff --git a/cache-ri-impl/pom.xml b/cache-ri-impl/pom.xml
index 804c064..d3f30b6 100644
--- a/cache-ri-impl/pom.xml
+++ b/cache-ri-impl/pom.xml
@@ -19,8 +19,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 108299b..3fddad9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.enterprise</groupId>
-                <artifactId>cdi-api</artifactId>
-                <version>1.0-SP4</version>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                <version>4.0.1</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>

From 703ffeac16a90751194f77f69b726fd82de9c6ce Mon Sep 17 00:00:00 2001
From: Fabian Franz BSc <fabian.franz@inet-logistics.com>
Date: Mon, 2 Jan 2023 15:54:15 +0100
Subject: [PATCH 2/2] add relative paths to support building single projects

---
 cache-annotations-ri/cache-annotations-ri-cdi/pom.xml    | 1 +
 cache-annotations-ri/cache-annotations-ri-common/pom.xml | 1 +
 cache-annotations-ri/cache-annotations-ri-guice/pom.xml  | 1 +
 cache-annotations-ri/cache-annotations-ri-spring/pom.xml | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml b/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
index 2e2f972..17d943f 100644
--- a/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
@@ -6,6 +6,7 @@
         <groupId>org.jsr107.ri</groupId>
         <artifactId>cache-annotations-ri</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>cache-annotations-ri-cdi</artifactId>
diff --git a/cache-annotations-ri/cache-annotations-ri-common/pom.xml b/cache-annotations-ri/cache-annotations-ri-common/pom.xml
index 8ff06f5..bc437b6 100644
--- a/cache-annotations-ri/cache-annotations-ri-common/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-common/pom.xml
@@ -6,6 +6,7 @@
         <groupId>org.jsr107.ri</groupId>
         <artifactId>cache-annotations-ri</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>cache-annotations-ri-common</artifactId>
diff --git a/cache-annotations-ri/cache-annotations-ri-guice/pom.xml b/cache-annotations-ri/cache-annotations-ri-guice/pom.xml
index 56ebea4..c0cf18c 100644
--- a/cache-annotations-ri/cache-annotations-ri-guice/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-guice/pom.xml
@@ -6,6 +6,7 @@
         <groupId>org.jsr107.ri</groupId>
         <artifactId>cache-annotations-ri</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.jsr107.ri</groupId>
diff --git a/cache-annotations-ri/cache-annotations-ri-spring/pom.xml b/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
index 8feba78..d72ec82 100644
--- a/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
+++ b/cache-annotations-ri/cache-annotations-ri-spring/pom.xml
@@ -6,6 +6,7 @@
         <groupId>org.jsr107.ri</groupId>
         <artifactId>cache-annotations-ri</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>cache-annotations-ri-spring</artifactId>
@@ -15,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.version>6.0.0</spring.version>
+        <spring.version>6.0.3</spring.version>
     </properties>
 
     <dependencies>