Skip to content

Commit c09992c

Browse files
authored
Java-49698 Upgrade spring-jersey for SB3 (#18936)
1 parent a22a329 commit c09992c

File tree

20 files changed

+86
-46
lines changed

20 files changed

+86
-46
lines changed

pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,6 @@
803803
<module>spring-ejb-modules</module>
804804
<module>spring-exceptions</module>
805805
<module>spring-grpc</module>
806-
<module>spring-jersey</module>
807806
<module>spring-kafka</module>
808807
<module>spring-kafka-2</module>
809808
<module>spring-kafka-3</module>
@@ -1288,7 +1287,6 @@
12881287
<module>spring-ejb-modules</module>
12891288
<module>spring-exceptions</module>
12901289
<module>spring-grpc</module>
1291-
<module>spring-jersey</module>
12921290
<module>spring-kafka</module>
12931291
<module>spring-kafka-2</module>
12941292
<module>spring-kafka-3</module>

spring-web-modules/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<module>spring-thymeleaf-5</module>
5757
<module>spring-web-url</module>
5858
<module>spring-thymeleaf-attributes</module>
59+
<module>spring-jersey</module>
5960
</modules>
6061

6162
<build>
File renamed without changes.

spring-jersey/pom.xml renamed to spring-web-modules/spring-jersey/pom.xml

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-modules</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
13+
<artifactId>spring-web-modules</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
1515
</parent>
1616

1717
<dependencies>
@@ -25,6 +25,16 @@
2525
<groupId>org.glassfish.jersey.media</groupId>
2626
<artifactId>jersey-media-json-jackson</artifactId>
2727
<version>${jersey.version}</version>
28+
<exclusions>
29+
<exclusion>
30+
<groupId>com.fasterxml.jackson.module</groupId>
31+
<artifactId>jackson-module-jaxb-annotations</artifactId>
32+
</exclusion>
33+
</exclusions>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.fasterxml.jackson.module</groupId>
37+
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
2838
</dependency>
2939
<dependency>
3040
<groupId>org.glassfish.jersey.core</groupId>
@@ -33,15 +43,33 @@
3343
</dependency>
3444
<!-- servlet api -->
3545
<dependency>
36-
<groupId>javax.servlet</groupId>
37-
<artifactId>javax.servlet-api</artifactId>
38-
<version>${javax.servlet-api.version}</version>
46+
<groupId>jakarta.servlet</groupId>
47+
<artifactId>jakarta.servlet-api</artifactId>
48+
<version>${jakarta.servlet-api.version}</version>
3949
<scope>provided</scope>
4050
</dependency>
51+
<!-- Spring -->
52+
<dependency>
53+
<groupId>org.springframework</groupId>
54+
<artifactId>spring-web</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.springframework</groupId>
58+
<artifactId>spring-context</artifactId>
59+
</dependency>
60+
<!-- JAXB API for Jakarta EE -->
61+
<dependency>
62+
<groupId>jakarta.xml.bind</groupId>
63+
<artifactId>jakarta.xml.bind-api</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.glassfish.jaxb</groupId>
67+
<artifactId>jaxb-runtime</artifactId>
68+
</dependency>
4169
<!-- optional library -->
4270
<dependency>
4371
<groupId>org.glassfish.jersey.ext</groupId>
44-
<artifactId>jersey-spring4</artifactId>
72+
<artifactId>jersey-spring6</artifactId>
4573
<version>${jersey.version}</version>
4674
<exclusions>
4775
<exclusion>
@@ -86,14 +114,20 @@
86114
</dependency>
87115
<dependency>
88116
<groupId>org.wiremock</groupId>
89-
<artifactId>wiremock</artifactId>
117+
<artifactId>wiremock-jetty12</artifactId>
90118
<version>${wiremock.version}</version>
91119
<scope>test</scope>
92120
</dependency>
93121
<dependency>
94122
<groupId>com.fasterxml.jackson.jaxrs</groupId>
95123
<artifactId>jackson-jaxrs-json-provider</artifactId>
96124
<version>${jackson.version}</version>
125+
<exclusions>
126+
<exclusion>
127+
<groupId>com.fasterxml.jackson.module</groupId>
128+
<artifactId>jackson-module-jaxb-annotations</artifactId>
129+
</exclusion>
130+
</exclusions>
97131
</dependency>
98132
<dependency>
99133
<groupId>com.fasterxml.jackson.core</groupId>
@@ -195,6 +229,13 @@
195229
<failOnMissingWebXml>false</failOnMissingWebXml>
196230
</configuration>
197231
</plugin>
232+
<plugin>
233+
<groupId>org.springframework.boot</groupId>
234+
<artifactId>spring-boot-maven-plugin</artifactId>
235+
<configuration>
236+
<skip>true</skip>
237+
</configuration>
238+
</plugin>
198239
<plugin>
199240
<groupId>org.codehaus.cargo</groupId>
200241
<artifactId>cargo-maven2-plugin</artifactId>
@@ -216,12 +257,12 @@
216257
</build>
217258

218259
<properties>
219-
<jersey.version>2.29.1</jersey.version>
260+
<jersey.version>3.1.3</jersey.version>
261+
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
220262
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
221263
<httpcore.version>4.4.9</httpcore.version>
222264
<httpclient.version>4.5.5</httpclient.version>
223265
<wiremock.version>3.9.1</wiremock.version>
224-
<spring-boot.version>1.5.10.RELEASE</spring-boot.version>
225266
</properties>
226267

227268
</project>

spring-jersey/src/main/java/com/baeldung/client/rest/RestClient.java renamed to spring-web-modules/spring-jersey/src/main/java/com/baeldung/client/rest/RestClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.baeldung.client.rest;
22

3-
import javax.ws.rs.client.Client;
4-
import javax.ws.rs.client.ClientBuilder;
5-
import javax.ws.rs.client.Entity;
6-
import javax.ws.rs.core.MediaType;
7-
import javax.ws.rs.core.Response;
3+
import jakarta.ws.rs.client.Client;
4+
import jakarta.ws.rs.client.ClientBuilder;
5+
import jakarta.ws.rs.client.Entity;
6+
import jakarta.ws.rs.core.MediaType;
7+
import jakarta.ws.rs.core.Response;
88

99
import com.baeldung.server.model.Employee;
1010

spring-jersey/src/main/java/com/baeldung/server/config/ApplicationInitializer.java renamed to spring-web-modules/spring-jersey/src/main/java/com/baeldung/server/config/ApplicationInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.server.config;
22

3-
import javax.servlet.ServletContext;
4-
import javax.servlet.ServletException;
3+
import jakarta.servlet.ServletContext;
4+
import jakarta.servlet.ServletException;
55

66
import org.springframework.core.Ordered;
77
import org.springframework.core.annotation.Order;

spring-jersey/src/main/java/com/baeldung/server/config/RestConfig.java renamed to spring-web-modules/spring-jersey/src/main/java/com/baeldung/server/config/RestConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.server.config;
22

3-
import javax.ws.rs.ApplicationPath;
4-
import javax.ws.rs.core.Application;
3+
import jakarta.ws.rs.ApplicationPath;
4+
import jakarta.ws.rs.core.Application;
55

66
import com.baeldung.server.exception.AlreadyExistsExceptionHandler;
77
import com.baeldung.server.exception.NotFoundExceptionHandler;

spring-jersey/src/main/java/com/baeldung/server/exception/AlreadyExistsExceptionHandler.java renamed to spring-web-modules/spring-jersey/src/main/java/com/baeldung/server/exception/AlreadyExistsExceptionHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.server.exception;
22

3-
import javax.ws.rs.core.Response;
4-
import javax.ws.rs.ext.ExceptionMapper;
5-
import javax.ws.rs.ext.Provider;
3+
import jakarta.ws.rs.core.Response;
4+
import jakarta.ws.rs.ext.ExceptionMapper;
5+
import jakarta.ws.rs.ext.Provider;
66

77
@Provider
88
public class AlreadyExistsExceptionHandler implements ExceptionMapper<EmployeeAlreadyExists> {

0 commit comments

Comments
 (0)