Skip to content

Commit 3f6734b

Browse files
mp911demp911de
committed
Migrate to Jakarta EE 9.
Closes #2172
1 parent 0cea6ed commit 3f6734b

File tree

11 files changed

+69
-92
lines changed

11 files changed

+69
-92
lines changed

Diff for: ‎pom.xml

+12-38
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616
</parent>
1717

1818
<properties>
19-
<spring>6.0.0-SNAPSHOT</spring>
2019
<springdata.keyvalue>3.0.0-SNAPSHOT</springdata.keyvalue>
2120
<awaitility>4.0.2</awaitility>
22-
<jta>1.1</jta>
2321
<beanutils>1.9.4</beanutils>
2422
<xstream>1.4.18</xstream>
2523
<pool>2.9.0</pool>
@@ -148,46 +146,36 @@
148146

149147
<!-- CDI -->
150148
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
151-
<dependency>
152-
<groupId>org.apache.geronimo.specs</groupId>
153-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
154-
<version>1.0.1</version>
155-
<optional>true</optional>
156-
</dependency>
157149

158150
<dependency>
159-
<groupId>javax.interceptor</groupId>
160-
<artifactId>javax.interceptor-api</artifactId>
161-
<version>1.2.1</version>
162-
<scope>test</scope>
163-
</dependency>
164-
165-
<dependency>
166-
<groupId>javax.enterprise</groupId>
167-
<artifactId>cdi-api</artifactId>
151+
<groupId>jakarta.enterprise</groupId>
152+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
168153
<version>${cdi}</version>
169154
<scope>provided</scope>
170155
<optional>true</optional>
171156
</dependency>
172157

173158
<dependency>
174-
<groupId>javax.annotation</groupId>
175-
<artifactId>javax.annotation-api</artifactId>
176-
<version>${javax-annotation-api}</version>
159+
<groupId>org.apache.openwebbeans</groupId>
160+
<artifactId>openwebbeans-se</artifactId>
161+
<classifier>jakarta</classifier>
162+
<version>${webbeans}</version>
177163
<scope>test</scope>
178164
</dependency>
179165

180166
<dependency>
181167
<groupId>org.apache.openwebbeans</groupId>
182-
<artifactId>openwebbeans-se</artifactId>
168+
<artifactId>openwebbeans-spi</artifactId>
169+
<classifier>jakarta</classifier>
183170
<version>${webbeans}</version>
184171
<scope>test</scope>
185172
</dependency>
186173

187174
<dependency>
188-
<groupId>org.apache.xbean</groupId>
189-
<artifactId>xbean-asm9-shaded</artifactId>
190-
<version>${webbeans.xbean}</version>
175+
<groupId>org.apache.openwebbeans</groupId>
176+
<artifactId>openwebbeans-impl</artifactId>
177+
<classifier>jakarta</classifier>
178+
<version>${webbeans}</version>
191179
<scope>test</scope>
192180
</dependency>
193181

@@ -240,20 +228,6 @@
240228
<scope>test</scope>
241229
</dependency>
242230

243-
<dependency>
244-
<groupId>javax.transaction</groupId>
245-
<artifactId>jta</artifactId>
246-
<version>${jta}</version>
247-
<scope>test</scope>
248-
</dependency>
249-
250-
<dependency>
251-
<groupId>javax.annotation</groupId>
252-
<artifactId>jsr250-api</artifactId>
253-
<version>1.0</version>
254-
<scope>test</scope>
255-
</dependency>
256-
257231
<dependency>
258232
<groupId>com.thoughtworks.xstream</groupId>
259233
<artifactId>xstream</artifactId>

Diff for: ‎src/main/java/org/springframework/data/redis/repository/cdi/CdiBean.java

+24-23
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
*/
1616
package org.springframework.data.redis.repository.cdi;
1717

18+
import jakarta.enterprise.context.ApplicationScoped;
19+
import jakarta.enterprise.context.spi.CreationalContext;
20+
import jakarta.enterprise.inject.Alternative;
21+
import jakarta.enterprise.inject.Default;
22+
import jakarta.enterprise.inject.Stereotype;
23+
import jakarta.enterprise.inject.spi.Bean;
24+
import jakarta.enterprise.inject.spi.BeanManager;
25+
import jakarta.enterprise.inject.spi.InjectionPoint;
26+
import jakarta.enterprise.inject.spi.PassivationCapable;
27+
1828
import java.lang.annotation.Annotation;
1929
import java.lang.reflect.Type;
2030
import java.util.ArrayList;
@@ -24,18 +34,9 @@
2434
import java.util.List;
2535
import java.util.Set;
2636

27-
import javax.enterprise.context.ApplicationScoped;
28-
import javax.enterprise.context.spi.CreationalContext;
29-
import javax.enterprise.inject.Alternative;
30-
import javax.enterprise.inject.Default;
31-
import javax.enterprise.inject.Stereotype;
32-
import javax.enterprise.inject.spi.Bean;
33-
import javax.enterprise.inject.spi.BeanManager;
34-
import javax.enterprise.inject.spi.InjectionPoint;
35-
import javax.enterprise.inject.spi.PassivationCapable;
36-
3737
import org.apache.commons.logging.Log;
3838
import org.apache.commons.logging.LogFactory;
39+
3940
import org.springframework.util.Assert;
4041
import org.springframework.util.StringUtils;
4142

@@ -114,7 +115,7 @@ private final String createPassivationId(Set<Annotation> qualifiers, Class<?> re
114115

115116
/*
116117
* (non-Javadoc)
117-
* @see javax.enterprise.inject.spi.Bean#getTypes()
118+
* @see jakarta.enterprise.inject.spi.Bean#getTypes()
118119
*/
119120
public Set<Type> getTypes() {
120121

@@ -133,8 +134,8 @@ public Set<Type> getTypes() {
133134
* @param bean the {@link Bean} defining the instance to create.
134135
* @param type the expected component type of the instance created from the {@link Bean}.
135136
* @return an instance of the given {@link Bean}.
136-
* @see javax.enterprise.inject.spi.BeanManager#getReference(Bean, Type, CreationalContext)
137-
* @see javax.enterprise.inject.spi.Bean
137+
* @see jakarta.enterprise.inject.spi.BeanManager#getReference(Bean, Type, CreationalContext)
138+
* @see jakarta.enterprise.inject.spi.Bean
138139
* @see java.lang.reflect.Type
139140
*/
140141
@SuppressWarnings("unchecked")
@@ -151,7 +152,7 @@ public final void initialize() {
151152

152153
/*
153154
* (non-Javadoc)
154-
* @see javax.enterprise.context.spi.Contextual#destroy(java.lang.Object, javax.enterprise.context.spi.CreationalContext)
155+
* @see jakarta.enterprise.context.spi.Contextual#destroy(java.lang.Object, jakarta.enterprise.context.spi.CreationalContext)
155156
*/
156157
public void destroy(T instance, CreationalContext<T> creationalContext) {
157158

@@ -165,15 +166,15 @@ public void destroy(T instance, CreationalContext<T> creationalContext) {
165166

166167
/*
167168
* (non-Javadoc)
168-
* @see javax.enterprise.inject.spi.Bean#getQualifiers()
169+
* @see jakarta.enterprise.inject.spi.Bean#getQualifiers()
169170
*/
170171
public Set<Annotation> getQualifiers() {
171172
return qualifiers;
172173
}
173174

174175
/*
175176
* (non-Javadoc)
176-
* @see javax.enterprise.inject.spi.Bean#getName()
177+
* @see jakarta.enterprise.inject.spi.Bean#getName()
177178
*/
178179
public String getName() {
179180

@@ -183,7 +184,7 @@ public String getName() {
183184

184185
/*
185186
* (non-Javadoc)
186-
* @see javax.enterprise.inject.spi.Bean#getStereotypes()
187+
* @see jakarta.enterprise.inject.spi.Bean#getStereotypes()
187188
*/
188189
public Set<Class<? extends Annotation>> getStereotypes() {
189190

@@ -201,47 +202,47 @@ public Set<Class<? extends Annotation>> getStereotypes() {
201202

202203
/*
203204
* (non-Javadoc)
204-
* @see javax.enterprise.inject.spi.Bean#getBeanClass()
205+
* @see jakarta.enterprise.inject.spi.Bean#getBeanClass()
205206
*/
206207
public Class<?> getBeanClass() {
207208
return beanClass;
208209
}
209210

210211
/*
211212
* (non-Javadoc)
212-
* @see javax.enterprise.inject.spi.Bean#isAlternative()
213+
* @see jakarta.enterprise.inject.spi.Bean#isAlternative()
213214
*/
214215
public boolean isAlternative() {
215216
return beanClass.isAnnotationPresent(Alternative.class);
216217
}
217218

218219
/*
219220
* (non-Javadoc)
220-
* @see javax.enterprise.inject.spi.Bean#isNullable()
221+
* @see jakarta.enterprise.inject.spi.Bean#isNullable()
221222
*/
222223
public boolean isNullable() {
223224
return false;
224225
}
225226

226227
/*
227228
* (non-Javadoc)
228-
* @see javax.enterprise.inject.spi.Bean#getInjectionPoints()
229+
* @see jakarta.enterprise.inject.spi.Bean#getInjectionPoints()
229230
*/
230231
public Set<InjectionPoint> getInjectionPoints() {
231232
return Collections.emptySet();
232233
}
233234

234235
/*
235236
* (non-Javadoc)
236-
* @see javax.enterprise.inject.spi.Bean#getScope()
237+
* @see jakarta.enterprise.inject.spi.Bean#getScope()
237238
*/
238239
public Class<? extends Annotation> getScope() {
239240
return ApplicationScoped.class;
240241
}
241242

242243
/*
243244
* (non-Javadoc)
244-
* @see javax.enterprise.inject.spi.PassivationCapable#getId()
245+
* @see jakarta.enterprise.inject.spi.PassivationCapable#getId()
245246
*/
246247
public String getId() {
247248
return passivationId;

Diff for: ‎src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
package org.springframework.data.redis.repository.cdi;
1818

19+
import jakarta.enterprise.context.spi.CreationalContext;
20+
import jakarta.enterprise.inject.spi.Bean;
21+
import jakarta.enterprise.inject.spi.BeanManager;
22+
1923
import java.lang.annotation.Annotation;
2024
import java.lang.reflect.ParameterizedType;
2125
import java.lang.reflect.Type;
2226
import java.util.Set;
2327

24-
import javax.enterprise.context.spi.CreationalContext;
25-
import javax.enterprise.inject.spi.Bean;
26-
import javax.enterprise.inject.spi.BeanManager;
27-
2828
import org.springframework.beans.factory.DisposableBean;
2929
import org.springframework.data.redis.core.RedisKeyValueAdapter;
3030
import org.springframework.data.redis.core.RedisOperations;
@@ -57,7 +57,7 @@ public RedisKeyValueAdapterBean(Bean<RedisOperations<?, ?>> redisOperations, Set
5757

5858
/*
5959
* (non-Javadoc)
60-
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
60+
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
6161
*/
6262
@Override
6363
public RedisKeyValueAdapter create(CreationalContext<RedisKeyValueAdapter> creationalContext) {

Diff for: ‎src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueTemplateBean.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.springframework.data.redis.repository.cdi;
1818

19+
import jakarta.enterprise.context.spi.CreationalContext;
20+
import jakarta.enterprise.inject.spi.Bean;
21+
import jakarta.enterprise.inject.spi.BeanManager;
22+
1923
import java.lang.annotation.Annotation;
2024
import java.util.Set;
2125

22-
import javax.enterprise.context.spi.CreationalContext;
23-
import javax.enterprise.inject.spi.Bean;
24-
import javax.enterprise.inject.spi.BeanManager;
25-
2626
import org.springframework.beans.factory.DisposableBean;
2727
import org.springframework.data.keyvalue.core.KeyValueOperations;
2828
import org.springframework.data.redis.core.RedisKeyValueAdapter;
@@ -57,7 +57,7 @@ public RedisKeyValueTemplateBean(Bean<RedisKeyValueAdapter> keyValueAdapter, Set
5757

5858
/*
5959
* (non-Javadoc)
60-
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
60+
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
6161
*/
6262
@Override
6363
public KeyValueOperations create(CreationalContext<KeyValueOperations> creationalContext) {

Diff for: ‎src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryBean.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616
package org.springframework.data.redis.repository.cdi;
1717

18+
import jakarta.enterprise.context.spi.CreationalContext;
19+
import jakarta.enterprise.inject.spi.Bean;
20+
import jakarta.enterprise.inject.spi.BeanManager;
21+
1822
import java.lang.annotation.Annotation;
1923
import java.util.Optional;
2024
import java.util.Set;
2125

22-
import javax.enterprise.context.spi.CreationalContext;
23-
import javax.enterprise.inject.spi.Bean;
24-
import javax.enterprise.inject.spi.BeanManager;
25-
2626
import org.springframework.data.keyvalue.core.KeyValueOperations;
2727
import org.springframework.data.redis.repository.query.RedisQueryCreator;
2828
import org.springframework.data.redis.repository.support.RedisRepositoryFactory;
@@ -62,7 +62,7 @@ public RedisRepositoryBean(Bean<KeyValueOperations> keyValueTemplate, Set<Annota
6262

6363
/*
6464
* (non-Javadoc)
65-
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
65+
* @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(jakarta.enterprise.context.spi.CreationalContext, java.lang.Class)
6666
*/
6767
@Override
6868
protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {

Diff for: ‎src/main/java/org/springframework/data/redis/repository/cdi/RedisRepositoryExtension.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
*/
1616
package org.springframework.data.redis.repository.cdi;
1717

18+
import jakarta.enterprise.event.Observes;
19+
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
20+
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
21+
import jakarta.enterprise.inject.spi.Bean;
22+
import jakarta.enterprise.inject.spi.BeanManager;
23+
import jakarta.enterprise.inject.spi.ProcessBean;
24+
1825
import java.lang.annotation.Annotation;
1926
import java.lang.reflect.ParameterizedType;
2027
import java.lang.reflect.Type;
@@ -24,15 +31,9 @@
2431
import java.util.Map.Entry;
2532
import java.util.Set;
2633

27-
import javax.enterprise.event.Observes;
28-
import javax.enterprise.inject.UnsatisfiedResolutionException;
29-
import javax.enterprise.inject.spi.AfterBeanDiscovery;
30-
import javax.enterprise.inject.spi.Bean;
31-
import javax.enterprise.inject.spi.BeanManager;
32-
import javax.enterprise.inject.spi.ProcessBean;
33-
3434
import org.apache.commons.logging.Log;
3535
import org.apache.commons.logging.LogFactory;
36+
3637
import org.springframework.data.keyvalue.core.KeyValueOperations;
3738
import org.springframework.data.redis.core.RedisKeyValueAdapter;
3839
import org.springframework.data.redis.core.RedisKeyValueTemplate;

Diff for: ‎src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension renamed to ‎src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension

File renamed without changes.

Diff for: ‎src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717

1818
import static org.assertj.core.api.Assertions.*;
1919

20+
import jakarta.enterprise.context.ApplicationScoped;
21+
import jakarta.enterprise.inject.se.SeContainer;
22+
import jakarta.enterprise.inject.se.SeContainerInitializer;
23+
import jakarta.enterprise.inject.spi.Bean;
24+
2025
import java.util.List;
2126
import java.util.Set;
2227

23-
import javax.enterprise.context.ApplicationScoped;
24-
import javax.enterprise.inject.se.SeContainer;
25-
import javax.enterprise.inject.se.SeContainerInitializer;
26-
import javax.enterprise.inject.spi.Bean;
27-
2828
import org.junit.jupiter.api.AfterAll;
2929
import org.junit.jupiter.api.BeforeAll;
3030
import org.junit.jupiter.api.Test;

Diff for: ‎src/test/java/org/springframework/data/redis/repository/cdi/PersonDB.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*/
1616
package org.springframework.data.redis.repository.cdi;
1717

18+
import jakarta.inject.Qualifier;
19+
1820
import java.lang.annotation.ElementType;
1921
import java.lang.annotation.Retention;
2022
import java.lang.annotation.RetentionPolicy;
2123
import java.lang.annotation.Target;
2224

23-
import javax.inject.Qualifier;
2425

2526
/**
2627
* @author Mark Paluch

Diff for: ‎src/test/java/org/springframework/data/redis/repository/cdi/RedisCdiDependenciesProducer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.data.redis.repository.cdi;
1818

19-
import javax.enterprise.inject.Disposes;
20-
import javax.enterprise.inject.Produces;
19+
import jakarta.enterprise.inject.Disposes;
20+
import jakarta.enterprise.inject.Produces;
2121

2222
import org.springframework.beans.factory.DisposableBean;
2323
import org.springframework.data.redis.connection.RedisConnectionFactory;

0 commit comments

Comments
 (0)