Skip to content

Commit d9f5248

Browse files
mp911demp911de
committed
Migrate to Jakarta EE 9.
Rename javax imports to jakarta, switch to Jakarta API artifacts. Closes #2464
1 parent 26aeb43 commit d9f5248

25 files changed

+139
-159
lines changed

Diff for: ‎pom.xml

+28-54
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,20 @@
7272
</dependency>
7373

7474
<dependency>
75-
<groupId>javax.servlet</groupId>
76-
<artifactId>javax.servlet-api</artifactId>
77-
<version>${servlet-api}</version>
75+
<groupId>jakarta.servlet</groupId>
76+
<artifactId>jakarta.servlet-api</artifactId>
7877
<scope>provided</scope>
7978
</dependency>
80-
8179
<dependency>
82-
<groupId>javax.xml.bind</groupId>
83-
<artifactId>jaxb-api</artifactId>
80+
<groupId>jakarta.xml.bind</groupId>
81+
<artifactId>jakarta.xml.bind-api</artifactId>
8482
<version>${jaxb}</version>
8583
<scope>provided</scope>
8684
</dependency>
87-
8885
<dependency>
89-
<groupId>javax.annotation</groupId>
90-
<artifactId>javax.annotation-api</artifactId>
91-
<version>${javax-annotation-api}</version>
86+
<groupId>jakarta.annotation</groupId>
87+
<artifactId>jakarta.annotation-api</artifactId>
88+
<version>${jakarta-annotation-api}</version>
9289
<optional>true</optional>
9390
</dependency>
9491

@@ -166,38 +163,6 @@
166163
<optional>true</optional>
167164
</dependency>
168165

169-
<!-- EJB Transactions -->
170-
<dependency>
171-
<groupId>javax.ejb</groupId>
172-
<artifactId>ejb-api</artifactId>
173-
<version>3.0</version>
174-
<optional>true</optional>
175-
</dependency>
176-
177-
<!-- CDI -->
178-
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
179-
<dependency>
180-
<groupId>org.apache.geronimo.specs</groupId>
181-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
182-
<version>1.0.1</version>
183-
<scope>test</scope>
184-
</dependency>
185-
186-
<dependency>
187-
<groupId>javax.interceptor</groupId>
188-
<artifactId>javax.interceptor-api</artifactId>
189-
<version>1.2.2</version>
190-
<scope>test</scope>
191-
</dependency>
192-
193-
<dependency>
194-
<groupId>javax.enterprise</groupId>
195-
<artifactId>cdi-api</artifactId>
196-
<version>${cdi}</version>
197-
<scope>provided</scope>
198-
<optional>true</optional>
199-
</dependency>
200-
201166
<dependency>
202167
<groupId>com.google.guava</groupId>
203168
<artifactId>guava</artifactId>
@@ -212,24 +177,33 @@
212177
<optional>true</optional>
213178
</dependency>
214179

180+
<!-- CDI -->
181+
215182
<dependency>
216-
<groupId>javax.el</groupId>
217-
<artifactId>el-api</artifactId>
218-
<version>1.0</version>
219-
<scope>test</scope>
183+
<groupId>jakarta.enterprise</groupId>
184+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
185+
<scope>provided</scope>
186+
<optional>true</optional>
220187
</dependency>
221188

222189
<dependency>
223190
<groupId>org.apache.openwebbeans</groupId>
224191
<artifactId>openwebbeans-se</artifactId>
225-
<version>${webbeans}</version>
192+
<classifier>jakarta</classifier>
193+
<scope>test</scope>
194+
</dependency>
195+
196+
<dependency>
197+
<groupId>org.apache.openwebbeans</groupId>
198+
<artifactId>openwebbeans-spi</artifactId>
199+
<classifier>jakarta</classifier>
226200
<scope>test</scope>
227201
</dependency>
228202

229203
<dependency>
230-
<groupId>org.apache.xbean</groupId>
231-
<artifactId>xbean-asm9-shaded</artifactId>
232-
<version>${webbeans.xbean}</version>
204+
<groupId>org.apache.openwebbeans</groupId>
205+
<artifactId>openwebbeans-impl</artifactId>
206+
<classifier>jakarta</classifier>
233207
<scope>test</scope>
234208
</dependency>
235209

@@ -249,7 +223,7 @@
249223
<dependency>
250224
<groupId>com.sun.xml.bind</groupId>
251225
<artifactId>jaxb-impl</artifactId>
252-
<version>2.3.5</version>
226+
<version>3.0.2</version>
253227
<scope>test</scope>
254228
</dependency>
255229

@@ -322,9 +296,9 @@
322296
</dependency>
323297

324298
<dependency>
325-
<groupId>javax.transaction</groupId>
326-
<artifactId>javax.transaction-api</artifactId>
327-
<version>1.3</version>
299+
<groupId>jakarta.transaction</groupId>
300+
<artifactId>jakarta.transaction-api</artifactId>
301+
<version>2.0.0</version>
328302
<scope>test</scope>
329303
</dependency>
330304

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/OrderAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18-
import javax.xml.bind.annotation.adapters.XmlAdapter;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

2020
import org.springframework.data.domain.Sort.Direction;
2121
import org.springframework.data.domain.Sort.Order;
@@ -33,7 +33,7 @@ public class OrderAdapter extends XmlAdapter<OrderDto, Order> {
3333

3434
/*
3535
* (non-Javadoc)
36-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
36+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
3737
*/
3838
@Nullable
3939
@Override
@@ -51,7 +51,7 @@ public OrderDto marshal(@Nullable Order order) {
5151

5252
/*
5353
* (non-Javadoc)
54-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
54+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
5555
*/
5656
@Nullable
5757
@Override

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/PageAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
19+
1820
import java.util.Collections;
1921
import java.util.List;
2022

21-
import javax.xml.bind.annotation.adapters.XmlAdapter;
22-
2323
import org.springframework.data.domain.Page;
2424
import org.springframework.data.domain.jaxb.SpringDataJaxb.PageDto;
2525
import org.springframework.hateoas.Link;
@@ -34,7 +34,7 @@ public class PageAdapter extends XmlAdapter<PageDto, Page<Object>> {
3434

3535
/*
3636
* (non-Javadoc)
37-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
37+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
3838
*/
3939
@Nullable
4040
@Override
@@ -53,7 +53,7 @@ public PageDto marshal(@Nullable Page<Object> source) {
5353

5454
/*
5555
* (non-Javadoc)
56-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
56+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
5757
*/
5858
@Nullable
5959
@Override

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/PageableAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18-
import java.util.Collections;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

20-
import javax.xml.bind.annotation.adapters.XmlAdapter;
20+
import java.util.Collections;
2121

2222
import org.springframework.data.domain.PageRequest;
2323
import org.springframework.data.domain.Pageable;
@@ -36,7 +36,7 @@ class PageableAdapter extends XmlAdapter<PageRequestDto, Pageable> {
3636

3737
/*
3838
* (non-Javadoc)
39-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
39+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
4040
*/
4141
@Nullable
4242
@Override
@@ -58,7 +58,7 @@ public PageRequestDto marshal(@Nullable Pageable request) {
5858

5959
/*
6060
* (non-Javadoc)
61-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
61+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
6262
*/
6363
@NonNull
6464
@Override

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/SortAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18-
import javax.xml.bind.annotation.adapters.XmlAdapter;
18+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
1919

2020
import org.springframework.data.domain.Sort;
2121
import org.springframework.data.domain.jaxb.SpringDataJaxb.SortDto;
@@ -33,7 +33,7 @@ public class SortAdapter extends XmlAdapter<SortDto, Sort> {
3333

3434
/*
3535
* (non-Javadoc)
36-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
36+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#marshal(java.lang.Object)
3737
*/
3838
@Nullable
3939
@Override
@@ -51,7 +51,7 @@ public SortDto marshal(@Nullable Sort source) {
5151

5252
/*
5353
* (non-Javadoc)
54-
* @see javax.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
54+
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter#unmarshal(java.lang.Object)
5555
*/
5656
@NonNull
5757
@Override

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/SpringDataJaxb.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*/
1616
package org.springframework.data.domain.jaxb;
1717

18+
import jakarta.xml.bind.annotation.XmlAccessType;
19+
import jakarta.xml.bind.annotation.XmlAccessorType;
20+
import jakarta.xml.bind.annotation.XmlAnyElement;
21+
import jakarta.xml.bind.annotation.XmlAttribute;
22+
import jakarta.xml.bind.annotation.XmlElement;
23+
import jakarta.xml.bind.annotation.XmlElementWrapper;
24+
import jakarta.xml.bind.annotation.XmlRootElement;
25+
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
26+
1827
import java.util.ArrayList;
1928
import java.util.Collection;
2029
import java.util.Collections;
2130
import java.util.List;
2231

23-
import javax.xml.bind.annotation.XmlAccessType;
24-
import javax.xml.bind.annotation.XmlAccessorType;
25-
import javax.xml.bind.annotation.XmlAnyElement;
26-
import javax.xml.bind.annotation.XmlAttribute;
27-
import javax.xml.bind.annotation.XmlElement;
28-
import javax.xml.bind.annotation.XmlElementWrapper;
29-
import javax.xml.bind.annotation.XmlRootElement;
30-
import javax.xml.bind.annotation.adapters.XmlAdapter;
31-
3232
import org.springframework.data.domain.Page;
3333
import org.springframework.data.domain.PageRequest;
3434
import org.springframework.data.domain.Pageable;

Diff for: ‎src/main/java/org/springframework/data/domain/jaxb/package-info.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
@org.springframework.lang.NonNullApi
1414
package org.springframework.data.domain.jaxb;
1515

16-
import javax.xml.bind.annotation.XmlNs;
17-
import javax.xml.bind.annotation.XmlSchema;
18-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
19-
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
16+
import jakarta.xml.bind.annotation.XmlNs;
17+
import jakarta.xml.bind.annotation.XmlSchema;
18+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
19+
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
2020

2121
import org.springframework.data.domain.Page;
2222
import org.springframework.data.domain.Pageable;

0 commit comments

Comments
 (0)