diff --git a/pom.xml b/pom.xml index 582a5e65f..e97b51f66 100644 --- a/pom.xml +++ b/pom.xml @@ -72,23 +72,20 @@ - javax.servlet - javax.servlet-api - ${servlet-api} + jakarta.servlet + jakarta.servlet-api provided - - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api ${jaxb} provided - - javax.annotation - javax.annotation-api - ${javax-annotation-api} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-api} true @@ -173,38 +170,6 @@ true - - - javax.ejb - ejb-api - 3.0 - true - - - - - - org.apache.geronimo.specs - geronimo-jcdi_2.0_spec - 1.0.1 - test - - - - javax.interceptor - javax.interceptor-api - 1.2.2 - test - - - - javax.enterprise - cdi-api - ${cdi} - provided - true - - com.google.guava guava @@ -219,24 +184,33 @@ true + + - javax.el - el-api - 1.0 - test + jakarta.enterprise + jakarta.enterprise.cdi-api + provided + true org.apache.openwebbeans openwebbeans-se - ${webbeans} + jakarta test - org.apache.xbean - xbean-asm9-shaded - ${webbeans.xbean} + org.apache.openwebbeans + openwebbeans-spi + jakarta + test + + + + org.apache.openwebbeans + openwebbeans-impl + jakarta test @@ -256,7 +230,7 @@ com.sun.xml.bind jaxb-impl - 2.3.5 + 3.0.2 test @@ -329,9 +303,9 @@ - javax.transaction - javax.transaction-api - 1.3 + jakarta.transaction + jakarta.transaction-api + 2.0.0 test diff --git a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java index 361150ace..689877ea1 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java @@ -15,7 +15,7 @@ */ package org.springframework.data.domain.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.springframework.data.domain.Sort.Direction; import org.springframework.data.domain.Sort.Order; @@ -33,7 +33,7 @@ public class OrderAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Nullable @Override @@ -51,7 +51,7 @@ public class OrderAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Nullable @Override diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java index 6a8709434..44263c8af 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java @@ -15,11 +15,11 @@ */ package org.springframework.data.domain.jaxb; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.springframework.data.domain.Page; import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto; import org.springframework.hateoas.Link; @@ -34,7 +34,7 @@ public class PageAdapter extends XmlAdapter> { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Nullable @Override @@ -53,7 +53,7 @@ public class PageAdapter extends XmlAdapter> { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @Nullable @Override diff --git a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java index 7d1ee5c93..edf13f512 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java @@ -15,9 +15,9 @@ */ package org.springframework.data.domain.jaxb; -import java.util.Collections; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import java.util.Collections; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -36,7 +36,7 @@ class PageableAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Nullable @Override @@ -58,7 +58,7 @@ class PageableAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @NonNull @Override diff --git a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java index 04cc393ba..758fdcba1 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java @@ -15,7 +15,7 @@ */ package org.springframework.data.domain.jaxb; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import org.springframework.data.domain.Sort; import org.springframework.data.domain.jaxb.SpringDataJaxb.SortDto; @@ -33,7 +33,7 @@ public class SortAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object) */ @Nullable @Override @@ -51,7 +51,7 @@ public class SortAdapter extends XmlAdapter { /* * (non-Javadoc) - * @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object) */ @NonNull @Override diff --git a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java index 77d3d7f5c..fd77d2311 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java +++ b/src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java @@ -15,20 +15,20 @@ */ package org.springframework.data.domain.jaxb; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlAdapter; - import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/org/springframework/data/domain/jaxb/package-info.java b/src/main/java/org/springframework/data/domain/jaxb/package-info.java index 90c5cdf25..5bbdd590d 100644 --- a/src/main/java/org/springframework/data/domain/jaxb/package-info.java +++ b/src/main/java/org/springframework/data/domain/jaxb/package-info.java @@ -13,10 +13,10 @@ @org.springframework.lang.NonNullApi package org.springframework.data.domain.jaxb; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java index 169da4e86..0a9c26960 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryBean.java @@ -15,6 +15,15 @@ */ package org.springframework.data.repository.cdi; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.PassivationCapable; + import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.ArrayList; @@ -28,15 +37,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Stereotype; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.enterprise.inject.spi.PassivationCapable; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -157,7 +157,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getTypes() + * @see jakarta.enterprise.inject.spi.Bean#getTypes() */ @SuppressWarnings("rawtypes") public Set getTypes() { @@ -206,7 +206,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.context.spi.Contextual#create(javax.enterprise.context.spi.CreationalContext) + * @see jakarta.enterprise.context.spi.Contextual#create(jakarta.enterprise.context.spi.CreationalContext) */ public final T create(@SuppressWarnings("null") CreationalContext creationalContext) { @@ -226,7 +226,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.context.spi.Contextual#destroy(java.lang.Object, javax.enterprise.context.spi.CreationalContext) + * @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext) */ public void destroy(@SuppressWarnings("null") T instance, @SuppressWarnings("null") CreationalContext creationalContext) { @@ -241,7 +241,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getQualifiers() + * @see jakarta.enterprise.inject.spi.Bean#getQualifiers() */ public Set getQualifiers() { return qualifiers; @@ -249,7 +249,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getName() + * @see jakarta.enterprise.inject.spi.Bean#getName() */ public String getName() { return repositoryType.getName(); @@ -257,7 +257,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getStereotypes() + * @see jakarta.enterprise.inject.spi.Bean#getStereotypes() */ public Set> getStereotypes() { @@ -269,7 +269,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getBeanClass() + * @see jakarta.enterprise.inject.spi.Bean#getBeanClass() */ public Class getBeanClass() { return repositoryType; @@ -277,7 +277,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#isAlternative() + * @see jakarta.enterprise.inject.spi.Bean#isAlternative() */ public boolean isAlternative() { return isAnnotatedWith(repositoryType, Alternative.class); @@ -285,7 +285,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#isNullable() + * @see jakarta.enterprise.inject.spi.Bean#isNullable() */ public boolean isNullable() { return false; @@ -293,7 +293,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getInjectionPoints() + * @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints() */ public Set getInjectionPoints() { return Collections.emptySet(); @@ -301,7 +301,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.Bean#getScope() + * @see jakarta.enterprise.inject.spi.Bean#getScope() */ public Class getScope() { return ApplicationScoped.class; @@ -309,7 +309,7 @@ public abstract class CdiRepositoryBean implements Bean, PassivationCapabl /* * (non-Javadoc) - * @see javax.enterprise.inject.spi.PassivationCapable#getId() + * @see jakarta.enterprise.inject.spi.PassivationCapable#getId() */ public String getId() { return passivationId; diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java index cec142f20..84c8ee20f 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryContext.java @@ -15,11 +15,11 @@ */ package org.springframework.data.repository.cdi; +import jakarta.enterprise.inject.UnsatisfiedResolutionException; + import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.inject.UnsatisfiedResolutionException; - import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.ResourceLoader; diff --git a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java index 8419b5eb4..32c90c2f8 100644 --- a/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java +++ b/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java @@ -15,6 +15,17 @@ */ package org.springframework.data.repository.cdi; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.ProcessAnnotatedType; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.HashSet; @@ -22,19 +33,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.spi.AfterDeploymentValidation; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.Extension; -import javax.enterprise.inject.spi.ProcessAnnotatedType; -import javax.enterprise.util.AnnotationLiteral; -import javax.inject.Qualifier; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.log.LogMessage; import org.springframework.data.repository.NoRepositoryBean; diff --git a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java index e95008c78..6839cf5b9 100755 --- a/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java +++ b/src/test/java/org/springframework/data/domain/jaxb/SpringDataJaxbUnitTests.java @@ -17,6 +17,16 @@ package org.springframework.data.domain.jaxb; import static org.assertj.core.api.Assertions.*; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; @@ -24,19 +34,10 @@ import java.util.Collections; import java.util.List; import java.util.Scanner; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.custommonkey.xmlunit.Diff; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.data.domain.Page; diff --git a/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java b/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java index 3cf8f6bac..6a345a951 100644 --- a/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/mapping/context/PersistentPropertyPathFactoryUnitTests.java @@ -17,11 +17,12 @@ package org.springframework.data.mapping.context; import static org.assertj.core.api.Assertions.*; +import jakarta.inject.Inject; + import java.util.List; -import javax.inject.Inject; - import org.junit.jupiter.api.Test; + import org.springframework.data.annotation.Reference; import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.PersistentPropertyPath; diff --git a/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java index 97e1abdf9..481244a13 100644 --- a/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/CdiConfigurationIntegrationTests.java @@ -17,8 +17,8 @@ package org.springframework.data.repository.cdi; import static org.assertj.core.api.Assertions.*; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java index 4fee582cd..3b0895d0b 100755 --- a/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/CdiRepositoryBeanUnitTests.java @@ -19,6 +19,12 @@ import static java.util.Collections.*; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; +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.Named; + import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -26,12 +32,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -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.Named; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; @@ -67,7 +67,7 @@ import org.springframework.data.repository.query.RepositoryQuery; @MockitoSettings(strictness = Strictness.LENIENT) class CdiRepositoryBeanUnitTests { - static final String PASSIVATION_ID = "javax.enterprise.inject.Default:org.springframework.data.repository.cdi.CdiRepositoryBeanUnitTests$SampleRepository"; + static final String PASSIVATION_ID = "jakarta.enterprise.inject.Default:org.springframework.data.repository.cdi.CdiRepositoryBeanUnitTests$SampleRepository"; static final Set NO_ANNOTATIONS = emptySet(); static final Set SINGLE_ANNOTATION = singleton( diff --git a/src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java b/src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java index 0bbb73753..7fe151a18 100644 --- a/src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java +++ b/src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java @@ -15,6 +15,12 @@ */ package org.springframework.data.repository.cdi; +import jakarta.enterprise.context.NormalScope; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.BeanManager; + import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -23,14 +29,9 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.Set; -import javax.enterprise.context.NormalScope; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.AfterBeanDiscovery; -import javax.enterprise.inject.spi.BeanManager; - import org.apache.webbeans.context.AbstractContext; import org.mockito.Mockito; + import org.springframework.data.repository.config.CustomRepositoryImplementationDetector; import org.springframework.data.repository.core.support.DummyRepositoryFactory; diff --git a/src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java b/src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java index acb6a62af..b35d85c88 100644 --- a/src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java +++ b/src/test/java/org/springframework/data/repository/cdi/RepositoryClient.java @@ -15,7 +15,7 @@ */ package org.springframework.data.repository.cdi; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * diff --git a/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java index 69b66ca9c..c8c3f7ac4 100644 --- a/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/RepositoryFragmentsIntegrationTests.java @@ -17,14 +17,15 @@ package org.springframework.data.repository.cdi; import static org.assertj.core.api.Assertions.*; -import java.io.Serializable; +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.io.Serializable; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; + import org.springframework.data.repository.Repository; /** diff --git a/src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java b/src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java index cca8b810c..2c6fe3c1e 100644 --- a/src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java +++ b/src/test/java/org/springframework/data/repository/cdi/StereotypeAnnotation.java @@ -15,11 +15,11 @@ */ package org.springframework.data.repository.cdi; +import jakarta.enterprise.inject.Stereotype; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import javax.enterprise.inject.Stereotype; - @Stereotype @Retention(RetentionPolicy.RUNTIME) @interface StereotypeAnnotation { diff --git a/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java b/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java index 0d983e813..7d6d8e0b8 100755 --- a/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java +++ b/src/test/java/org/springframework/data/repository/cdi/WebbeansCdiRepositoryExtensionSupportIntegrationTests.java @@ -15,8 +15,8 @@ */ package org.springframework.data.repository.cdi; -import javax.enterprise.inject.se.SeContainer; -import javax.enterprise.inject.se.SeContainerInitializer; +import jakarta.enterprise.inject.se.SeContainer; +import jakarta.enterprise.inject.se.SeContainerInitializer; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java b/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java index 03ed0ef3d..fae71069d 100755 --- a/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java @@ -17,12 +17,13 @@ package org.springframework.data.repository.config; import static org.assertj.core.api.Assertions.*; -import java.io.IOException; +import jakarta.inject.Named; -import javax.inject.Named; +import java.io.IOException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java index c060fe6df..6d0a2197d 100755 --- a/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/TransactionRepositoryProxyPostProcessorUnitTests.java @@ -84,7 +84,7 @@ class TransactionRepositoryProxyPostProcessorUnitTests { @Test // DATACMNS-732 void considersJtaTransactional() throws Exception { - Method method = SampleRepository.class.getMethod("methodWithJtaOneDotTwoAtTransactional"); + Method method = SampleRepository.class.getMethod("methodWithJakartaAtTransactional"); TransactionAttributeSource attributeSource = new RepositoryAnnotationTransactionAttributeSource( repositoryInformation, true); @@ -115,8 +115,8 @@ class TransactionRepositoryProxyPostProcessorUnitTests { Sample save(Sample object); - @javax.transaction.Transactional - void methodWithJtaOneDotTwoAtTransactional(); + @jakarta.transaction.Transactional + void methodWithJakartaAtTransactional(); } static class SampleImplementation { diff --git a/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java b/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java index dbae07d46..cf292f0f5 100755 --- a/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java +++ b/src/test/java/org/springframework/data/web/PageableDefaultUnitTests.java @@ -18,7 +18,7 @@ package org.springframework.data.web; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.web.SortDefaultUnitTests.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java index 5888f1d9b..878f25a9b 100755 --- a/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java +++ b/src/test/java/org/springframework/data/web/SortHandlerMethodArgumentResolverUnitTests.java @@ -18,9 +18,9 @@ package org.springframework.data.web; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.Sort.Direction.*; -import java.util.stream.Stream; +import jakarta.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequest; +import java.util.stream.Stream; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/springframework/data/web/WebTestUtils.java b/src/test/java/org/springframework/data/web/WebTestUtils.java index 42effbb74..8bb0ac22e 100644 --- a/src/test/java/org/springframework/data/web/WebTestUtils.java +++ b/src/test/java/org/springframework/data/web/WebTestUtils.java @@ -15,7 +15,7 @@ */ package org.springframework.data.web; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockServletContext; diff --git a/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension