Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CDI Jakarta EE 10 #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CDI Jakarta EE 10 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2f173
Support for Spring 6 / Jakarta EE 9/10
fabianfrz Jan 2, 2023
703ffea
add relative paths to support building single projects
fabianfrz Jan 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cache-annotations-ri/cache-annotations-ri-cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -28,8 +29,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>

Expand Down
8 changes: 4 additions & 4 deletions ...cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/BeanManagerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...cache-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheLookupUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions ...e-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CachePutInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
8 changes: 4 additions & 4 deletions ...tations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveAllInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
8 changes: 4 additions & 4 deletions ...tions-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheRemoveEntryInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
8 changes: 4 additions & 4 deletions ...nnotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CacheResultInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
2 changes: 1 addition & 1 deletion ...ons-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheInvocationContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/CdiCacheKeyInvocationContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...-annotations-ri-cdi/src/main/java/org/jsr107/ri/annotations/cdi/InterceptorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 ...ces/javax.enterprise.inject.spi.Extension → ...s/jakarta.enterprise.inject.spi.Extension
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions cache-annotations-ri/cache-annotations-ri-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions cache-annotations-ri/cache-annotations-ri-guice/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion cache-annotations-ri/cache-annotations-ri-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -15,7 +16,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.version>3.2.18.RELEASE</spring.version>
<spring.version>6.0.3</spring.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions cache-ri-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down