diff --git a/pom.xml b/pom.xml index 4e13e7e..b915263 100644 --- a/pom.xml +++ b/pom.xml @@ -82,46 +82,42 @@ - - - org.apache.geronimo.specs - geronimo-jcdi_2.0_spec - 1.0.1 - true - - javax.interceptor - javax.interceptor-api - 1.2.1 - test - - - - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api ${cdi} true - javax.annotation - javax.annotation-api - ${javax-annotation-api} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-api} test org.apache.openwebbeans openwebbeans-se + jakarta ${webbeans} test - org.apache.xbean - xbean-asm9-shaded - ${webbeans.xbean} + org.apache.openwebbeans + openwebbeans-spi + jakarta + ${webbeans} + test + + + + org.apache.openwebbeans + openwebbeans-impl + jakarta + ${webbeans} test diff --git a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java index ff008e1..ff8220c 100644 --- a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java +++ b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java @@ -15,14 +15,14 @@ */ package org.springframework.data.ldap.repository.cdi; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; + import java.lang.annotation.Annotation; import java.util.Optional; import java.util.Set; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; - import org.springframework.data.ldap.repository.support.LdapRepositoryFactory; import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.config.CustomRepositoryImplementationDetector; @@ -60,7 +60,7 @@ public class LdapRepositoryBean extends CdiRepositoryBean { /* * (non-Javadoc) - * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class) + * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class) */ @Override protected T create(CreationalContext creationalContext, Class repositoryType) { diff --git a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryExtension.java b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryExtension.java index 59269b4..a71dcb1 100644 --- a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryExtension.java +++ b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryExtension.java @@ -15,6 +15,13 @@ */ package org.springframework.data.ldap.repository.cdi; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.ProcessBean; + import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.HashMap; @@ -24,16 +31,8 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.Set; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.UnsatisfiedResolutionException; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.ProcessBean; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport; import org.springframework.ldap.core.LdapOperations; diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/ldap/repository/cdi/CdiExtensionIntegrationTests.java index 2d4fffe..357e0c5 100644 --- a/src/test/java/org/springframework/data/ldap/repository/cdi/CdiExtensionIntegrationTests.java +++ b/src/test/java/org/springframework/data/ldap/repository/cdi/CdiExtensionIntegrationTests.java @@ -18,10 +18,10 @@ package org.springframework.data.ldap.repository.cdi; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import java.util.Collections; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import java.util.Collections; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/LdapTemplateProducer.java b/src/test/java/org/springframework/data/ldap/repository/cdi/LdapTemplateProducer.java index 251d39d..90c96f8 100644 --- a/src/test/java/org/springframework/data/ldap/repository/cdi/LdapTemplateProducer.java +++ b/src/test/java/org/springframework/data/ldap/repository/cdi/LdapTemplateProducer.java @@ -17,8 +17,8 @@ package org.springframework.data.ldap.repository.cdi; import static org.mockito.Mockito.*; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.springframework.ldap.core.LdapTemplate; import org.springframework.ldap.odm.core.ObjectDirectoryMapper; diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java b/src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java index c7b6a28..0782b11 100644 --- a/src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java +++ b/src/test/java/org/springframework/data/ldap/repository/cdi/RepositoryClient.java @@ -15,10 +15,9 @@ */ package org.springframework.data.ldap.repository.cdi; +import jakarta.inject.Inject; import lombok.Getter; -import javax.inject.Inject; - import org.springframework.ldap.core.LdapTemplate; /** diff --git a/src/test/java/org/springframework/data/ldap/repository/support/QPerson.java b/src/test/java/org/springframework/data/ldap/repository/support/QPerson.java index 371f957..d374e75 100644 --- a/src/test/java/org/springframework/data/ldap/repository/support/QPerson.java +++ b/src/test/java/org/springframework/data/ldap/repository/support/QPerson.java @@ -17,8 +17,6 @@ package org.springframework.data.ldap.repository.support; import static com.querydsl.core.types.PathMetadataFactory.*; -import javax.annotation.Generated; - import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; import com.querydsl.core.types.dsl.EntityPathBase; @@ -29,7 +27,6 @@ import com.querydsl.core.types.dsl.StringPath; /** * QPerson is a Querydsl query type for Person */ -@Generated("com.mysema.query.codegen.EntitySerializer") public class QPerson extends EntityPathBase { private static final long serialVersionUID = -1526737794;