Skip to content

Commit 5a59e43

Browse files
mp911deschauder
mp911de
authored and
schauder
committed
Migrate to Jakarta EE 9.
Rename javax imports to jakarta, switch to Jakarta API artifacts. Closes #2464
1 parent 7cfc0c2 commit 5a59e43

25 files changed

+139
-159
lines changed

‎pom.xml

Lines changed: 28 additions & 54 deletions
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

@@ -173,38 +170,6 @@
173170
<optional>true</optional>
174171
</dependency>
175172

176-
<!-- EJB Transactions -->
177-
<dependency>
178-
<groupId>javax.ejb</groupId>
179-
<artifactId>ejb-api</artifactId>
180-
<version>3.0</version>
181-
<optional>true</optional>
182-
</dependency>
183-
184-
<!-- CDI -->
185-
<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
186-
<dependency>
187-
<groupId>org.apache.geronimo.specs</groupId>
188-
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
189-
<version>1.0.1</version>
190-
<scope>test</scope>
191-
</dependency>
192-
193-
<dependency>
194-
<groupId>javax.interceptor</groupId>
195-
<artifactId>javax.interceptor-api</artifactId>
196-
<version>1.2.2</version>
197-
<scope>test</scope>
198-
</dependency>
199-
200-
<dependency>
201-
<groupId>javax.enterprise</groupId>
202-
<artifactId>cdi-api</artifactId>
203-
<version>${cdi}</version>
204-
<scope>provided</scope>
205-
<optional>true</optional>
206-
</dependency>
207-
208173
<dependency>
209174
<groupId>com.google.guava</groupId>
210175
<artifactId>guava</artifactId>
@@ -219,24 +184,33 @@
219184
<optional>true</optional>
220185
</dependency>
221186

187+
<!-- CDI -->
188+
222189
<dependency>
223-
<groupId>javax.el</groupId>
224-
<artifactId>el-api</artifactId>
225-
<version>1.0</version>
226-
<scope>test</scope>
190+
<groupId>jakarta.enterprise</groupId>
191+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
192+
<scope>provided</scope>
193+
<optional>true</optional>
227194
</dependency>
228195

229196
<dependency>
230197
<groupId>org.apache.openwebbeans</groupId>
231198
<artifactId>openwebbeans-se</artifactId>
232-
<version>${webbeans}</version>
199+
<classifier>jakarta</classifier>
200+
<scope>test</scope>
201+
</dependency>
202+
203+
<dependency>
204+
<groupId>org.apache.openwebbeans</groupId>
205+
<artifactId>openwebbeans-spi</artifactId>
206+
<classifier>jakarta</classifier>
233207
<scope>test</scope>
234208
</dependency>
235209

236210
<dependency>
237-
<groupId>org.apache.xbean</groupId>
238-
<artifactId>xbean-asm9-shaded</artifactId>
239-
<version>${webbeans.xbean}</version>
211+
<groupId>org.apache.openwebbeans</groupId>
212+
<artifactId>openwebbeans-impl</artifactId>
213+
<classifier>jakarta</classifier>
240214
<scope>test</scope>
241215
</dependency>
242216

@@ -256,7 +230,7 @@
256230
<dependency>
257231
<groupId>com.sun.xml.bind</groupId>
258232
<artifactId>jaxb-impl</artifactId>
259-
<version>2.3.5</version>
233+
<version>3.0.2</version>
260234
<scope>test</scope>
261235
</dependency>
262236

@@ -329,9 +303,9 @@
329303
</dependency>
330304

331305
<dependency>
332-
<groupId>javax.transaction</groupId>
333-
<artifactId>javax.transaction-api</artifactId>
334-
<version>1.3</version>
306+
<groupId>jakarta.transaction</groupId>
307+
<artifactId>jakarta.transaction-api</artifactId>
308+
<version>2.0.0</version>
335309
<scope>test</scope>
336310
</dependency>
337311

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

Lines changed: 3 additions & 3 deletions
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

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

Lines changed: 4 additions & 4 deletions
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

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

Lines changed: 4 additions & 4 deletions
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

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

Lines changed: 3 additions & 3 deletions
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

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

Lines changed: 9 additions & 9 deletions
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;

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

Lines changed: 4 additions & 4 deletions
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)