Skip to content

Commit 73dbff1

Browse files
christophstroblchristophstrobl
committed
Move to Jakarta EE9
Closes: #3830
1 parent 49970eb commit 73dbff1

File tree

13 files changed

+71
-44
lines changed

13 files changed

+71
-44
lines changed

‎spring-data-mongodb/pom.xml

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@
152152

153153
<!-- CDI -->
154154
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
155-
<dependency>
156-
<groupId>org.apache.geronimo.specs</groupId>
157-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
158-
<version>1.0.1</version>
159-
<scope>optional</scope>
160-
</dependency>
161155

162156
<dependency>
163157
<groupId>javax.interceptor</groupId>
@@ -167,31 +161,48 @@
167161
</dependency>
168162

169163
<dependency>
170-
<groupId>javax.enterprise</groupId>
171-
<artifactId>cdi-api</artifactId>
164+
<groupId>jakarta.enterprise</groupId>
165+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
172166
<version>${cdi}</version>
173167
<scope>provided</scope>
174168
<optional>true</optional>
175169
</dependency>
176170

177171
<dependency>
178-
<groupId>javax.annotation</groupId>
179-
<artifactId>javax.annotation-api</artifactId>
180-
<version>${javax-annotation-api}</version>
172+
<groupId>jakarta.annotation</groupId>
173+
<artifactId>jakarta.annotation-api</artifactId>
174+
<version>${jakarta-annotation-api}</version>
181175
<scope>test</scope>
182176
</dependency>
183177

184178
<dependency>
185179
<groupId>org.apache.openwebbeans</groupId>
186180
<artifactId>openwebbeans-se</artifactId>
181+
<classifier>jakarta</classifier>
182+
<version>${webbeans}</version>
183+
<scope>test</scope>
184+
</dependency>
185+
186+
<dependency>
187+
<groupId>org.apache.openwebbeans</groupId>
188+
<artifactId>openwebbeans-spi</artifactId>
189+
<classifier>jakarta</classifier>
190+
<version>${webbeans}</version>
191+
<scope>test</scope>
192+
</dependency>
193+
194+
<dependency>
195+
<groupId>org.apache.openwebbeans</groupId>
196+
<artifactId>openwebbeans-impl</artifactId>
197+
<classifier>jakarta</classifier>
187198
<version>${webbeans}</version>
188199
<scope>test</scope>
189200
</dependency>
190201

191202
<!-- JSR 303 Validation -->
192203
<dependency>
193-
<groupId>javax.validation</groupId>
194-
<artifactId>validation-api</artifactId>
204+
<groupId>jakarta.validation</groupId>
205+
<artifactId>jakarta.validation-api</artifactId>
195206
<version>${validation}</version>
196207
<optional>true</optional>
197208
</dependency>
@@ -206,15 +217,31 @@
206217
<dependency>
207218
<groupId>org.hibernate</groupId>
208219
<artifactId>hibernate-validator</artifactId>
209-
<version>5.4.3.Final</version>
220+
<version>7.0.1.Final</version>
210221
<scope>test</scope>
211222
</dependency>
212223

224+
<dependency>
225+
<groupId>jakarta.el</groupId>
226+
<artifactId>jakarta.el-api</artifactId>
227+
<version>4.0.0</version>
228+
<scope>provided</scope>
229+
<optional>true</optional>
230+
</dependency>
213231
<dependency>
214232
<groupId>org.glassfish</groupId>
215-
<artifactId>javax.el</artifactId>
216-
<version>3.0.1-b11</version>
217-
<scope>test</scope>
233+
<artifactId>jakarta.el</artifactId>
234+
<version>4.0.2</version>
235+
<scope>provided</scope>
236+
<optional>true</optional>
237+
</dependency>
238+
239+
240+
<dependency>
241+
<groupId>jakarta.enterprise</groupId>
242+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
243+
<scope>provided</scope>
244+
<optional>true</optional>
218245
</dependency>
219246

220247
<dependency>
@@ -258,9 +285,9 @@
258285
</dependency>
259286

260287
<dependency>
261-
<groupId>javax.transaction</groupId>
262-
<artifactId>jta</artifactId>
263-
<version>1.1</version>
288+
<groupId>jakarta.transaction</groupId>
289+
<artifactId>jakarta.transaction-api</artifactId>
290+
<version>2.0.0</version>
264291
<scope>test</scope>
265292
</dependency>
266293

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
public class MappingMongoConverterParser implements BeanDefinitionParser {
8181

8282
private static final String BASE_PACKAGE = "base-package";
83-
private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
83+
private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator",
8484
MappingMongoConverterParser.class.getClassLoader());
8585

8686
/* (non-Javadoc)

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import java.util.Set;
1919

20-
import javax.validation.ConstraintViolationException;
21-
import javax.validation.Validator;
20+
import jakarta.validation.ConstraintViolationException;
21+
import jakarta.validation.Validator;
2222

2323
import org.apache.commons.logging.Log;
2424
import org.apache.commons.logging.LogFactory;

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import java.util.Optional;
2020
import java.util.Set;
2121

22-
import javax.enterprise.context.spi.CreationalContext;
23-
import javax.enterprise.inject.spi.Bean;
24-
import javax.enterprise.inject.spi.BeanManager;
22+
import jakarta.enterprise.context.spi.CreationalContext;
23+
import jakarta.enterprise.inject.spi.Bean;
24+
import jakarta.enterprise.inject.spi.BeanManager;
2525

2626
import org.springframework.data.mongodb.core.MongoOperations;
2727
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import java.util.Optional;
2525
import java.util.Set;
2626

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;
27+
import jakarta.enterprise.event.Observes;
28+
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
29+
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
30+
import jakarta.enterprise.inject.spi.Bean;
31+
import jakarta.enterprise.inject.spi.BeanManager;
32+
import jakarta.enterprise.inject.spi.ProcessBean;
3333

3434
import org.apache.commons.logging.Log;
3535
import org.apache.commons.logging.LogFactory;

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ static class JaxbDateTimeFormatter implements FormatterImpl {
9898

9999
static {
100100
try {
101-
DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
101+
DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("jakarta.xml.bind.DatatypeConverter")
102102
.getDeclaredMethod("parseDateTime", String.class);
103-
DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
103+
DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("jakarta.xml.bind.DatatypeConverter")
104104
.getDeclaredMethod("printDateTime", Calendar.class);
105105
} catch (NoSuchMethodException e) {
106106
throw new ExceptionInInitializerError(e);

‎spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension renamed to ‎spring-data-mongodb/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension

File renamed without changes.

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import static org.mockito.ArgumentMatchers.*;
2020
import static org.mockito.Mockito.*;
2121

22-
import javax.transaction.Status;
23-
import javax.transaction.UserTransaction;
22+
import jakarta.transaction.Status;
23+
import jakarta.transaction.UserTransaction;
2424

2525
import org.junit.jupiter.api.AfterEach;
2626
import org.junit.jupiter.api.Test;

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.springframework.data.mongodb.core.mapping.event;
1717

18-
import javax.validation.constraints.Min;
19-
import javax.validation.constraints.Size;
18+
import jakarta.validation.constraints.Min;
19+
import jakarta.validation.constraints.Size;
2020

2121
/**
2222
* Class used to test JSR-303 validation

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

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

20-
import javax.validation.ConstraintViolationException;
20+
import jakarta.validation.ConstraintViolationException;
2121

2222
import org.junit.jupiter.api.Test;
2323
import org.junit.jupiter.api.extension.ExtendWith;

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

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

20-
import javax.enterprise.inject.se.SeContainer;
21-
import javax.enterprise.inject.se.SeContainerInitializer;
20+
import jakarta.enterprise.inject.se.SeContainer;
21+
import jakarta.enterprise.inject.se.SeContainerInitializer;
2222

2323
import org.junit.jupiter.api.AfterAll;
2424
import org.junit.jupiter.api.BeforeAll;

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.springframework.data.mongodb.repository.cdi;
1717

18-
import javax.enterprise.context.ApplicationScoped;
19-
import javax.enterprise.inject.Produces;
18+
import jakarta.enterprise.context.ApplicationScoped;
19+
import jakarta.enterprise.inject.Produces;
2020

2121
import org.springframework.data.mongodb.MongoDatabaseFactory;
2222
import org.springframework.data.mongodb.core.MongoOperations;

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.mongodb.repository.cdi;
1717

18-
import javax.inject.Inject;
18+
import jakarta.inject.Inject;
1919

2020
/**
2121
* @author Oliver Gierke

0 commit comments

Comments
 (0)