From 3407d2aa51e440fdf1a8d3e913b311e3c3ad52c0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 Sep 2021 12:04:45 +0200 Subject: [PATCH] Migrate to Jakarta EE 9. Closes #1169 --- spring-data-cassandra/pom.xml | 37 ++++++++++--------- .../cdi/CassandraRepositoryBean.java | 10 ++--- .../cdi/CassandraRepositoryExtension.java | 14 +++---- ...> jakarta.enterprise.inject.spi.Extension} | 0 .../example/CassandraTemplateProducer.java | 8 ++-- .../cassandra/example/RepositoryClient.java | 4 +- .../cdi/CassandraOperationsProducer.java | 10 ++--- .../repository/cdi/CdiRepositoryClient.java | 2 +- .../repository/cdi/CdiRepositoryTests.java | 6 +-- .../repository/cdi/OtherQualifier.java | 4 +- .../data/cassandra/repository/cdi/UserDB.java | 4 +- 11 files changed, 50 insertions(+), 49 deletions(-) rename spring-data-cassandra/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%) diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index d37646895..55c4d879a 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -93,34 +93,35 @@ - - - org.apache.geronimo.specs - geronimo-jcdi_2.0_spec - 1.0.1 - provided - - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api ${cdi} provided true - - org.apache.openwebbeans openwebbeans-se + jakarta + ${webbeans} + test + + + + org.apache.openwebbeans + openwebbeans-spi + jakarta + ${webbeans} + test + + + + org.apache.openwebbeans + openwebbeans-impl + jakarta ${webbeans} test diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java index b48ed0c15..ad17c971e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryBean.java @@ -15,14 +15,14 @@ */ package org.springframework.data.cassandra.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.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.repository.support.CassandraRepositoryFactory; import org.springframework.data.repository.cdi.CdiRepositoryBean; @@ -59,7 +59,7 @@ public class CassandraRepositoryBean 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/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java index ef749f6d9..949011de9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/cdi/CassandraRepositoryExtension.java @@ -15,19 +15,19 @@ */ package org.springframework.data.cassandra.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.util.HashMap; import java.util.Map; 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.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.repository.cdi.CdiRepositoryBean; import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport; diff --git a/spring-data-cassandra/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/spring-data-cassandra/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from spring-data-cassandra/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to spring-data-cassandra/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/CassandraTemplateProducer.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/CassandraTemplateProducer.java index 501b8ce74..f1a6de2d9 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/CassandraTemplateProducer.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/CassandraTemplateProducer.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.example; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.springframework.data.cassandra.core.CassandraAdminTemplate; import org.springframework.data.cassandra.core.CassandraOperations; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/RepositoryClient.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/RepositoryClient.java index 5b1e09706..e288e67ee 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/RepositoryClient.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/example/RepositoryClient.java @@ -15,9 +15,9 @@ */ package org.springframework.data.cassandra.example; -import java.util.List; +import jakarta.inject.Inject; -import javax.inject.Inject; +import java.util.List; import org.springframework.data.cassandra.repository.CassandraRepository; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java index 158d39c52..07d63c0da 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CassandraOperationsProducer.java @@ -15,14 +15,14 @@ */ package org.springframework.data.cassandra.repository.cdi; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; + import java.net.InetSocketAddress; import java.util.Collections; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import org.springframework.data.cassandra.core.CassandraAdminTemplate; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraPersistentEntitySchemaCreator; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryClient.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryClient.java index 51d065f2f..6096a9549 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryClient.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryClient.java @@ -15,7 +15,7 @@ */ package org.springframework.data.cassandra.repository.cdi; -import javax.inject.Inject; +import jakarta.inject.Inject; /** * @author Mohsin Husen diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java index edc2e56bd..0f5719d60 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.repository.cdi; import static org.assertj.core.api.Assertions.*; -import java.util.Optional; +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.Optional; import org.junit.AfterClass; import org.junit.jupiter.api.BeforeAll; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/OtherQualifier.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/OtherQualifier.java index 746ce7c2d..cb1d0983f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/OtherQualifier.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/OtherQualifier.java @@ -16,13 +16,13 @@ package org.springframework.data.cassandra.repository.cdi; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - /** * @author Mark Paluch */ diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/UserDB.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/UserDB.java index 50e47b660..4ab68e0ea 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/UserDB.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/UserDB.java @@ -16,13 +16,13 @@ package org.springframework.data.cassandra.repository.cdi; +import jakarta.inject.Qualifier; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - /** * @author Mark Paluch */