这是indexloc提供的服务，不要输入任何密码
Skip to content

Java 49698 #18936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+86 −46
Open

Java 49698 #18936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b896b79
JAVA-49698: Changes made for upgrade spring-jersey for SB3 and move …
Bipinkumar27 Nov 11, 2025
8366d2a
JAVA-49698: Changes made for upgrade spring-jersey for SB3 and move …
Bipinkumar27 Nov 11, 2025
0f8b4e8
Merge branch 'master' into JAVA-49698
Bipinkumar27 Nov 12, 2025
7188fa4
Merge branch 'master' into JAVA-49698
Bipinkumar27 Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,6 @@
<module>spring-ejb-modules</module>
<module>spring-exceptions</module>
<module>spring-grpc</module>
<module>spring-jersey</module>
<module>spring-kafka</module>
<module>spring-kafka-2</module>
<module>spring-kafka-3</module>
Expand Down Expand Up @@ -1246,7 +1245,6 @@
<module>spring-ejb-modules</module>
<module>spring-exceptions</module>
<module>spring-grpc</module>
<module>spring-jersey</module>
<module>spring-kafka</module>
<module>spring-kafka-2</module>
<module>spring-kafka-3</module>
Expand Down
1 change: 1 addition & 0 deletions spring-web-modules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<module>spring-thymeleaf-5</module>
<module>spring-web-url</module>
<module>spring-thymeleaf-attributes</module>
<module>spring-jersey</module>
</modules>

<build>
Expand Down
0 spring-jersey/.gitignore → spring-web-modules/spring-jersey/.gitignore
View file
Open in desktop
File renamed without changes.
59 changes: 50 additions & 9 deletions spring-jersey/pom.xml → spring-web-modules/spring-jersey/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>spring-web-modules</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>

<dependencies>
Expand All @@ -25,6 +25,16 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand All @@ -33,15 +43,33 @@
</dependency>
<!-- servlet api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<!-- JAXB API for Jakarta EE -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<!-- optional library -->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring4</artifactId>
<artifactId>jersey-spring6</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -86,14 +114,20 @@
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<artifactId>wiremock-jetty12</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -195,6 +229,13 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
Expand All @@ -216,12 +257,12 @@
</build>

<properties>
<jersey.version>2.29.1</jersey.version>
<jersey.version>3.1.3</jersey.version>
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
<httpcore.version>4.4.9</httpcore.version>
<httpclient.version>4.5.5</httpclient.version>
<wiremock.version>3.9.1</wiremock.version>
<spring-boot.version>1.5.10.RELEASE</spring-boot.version>
</properties>

</project>
10 changes: 5 additions & 5 deletions .../com/baeldung/client/rest/RestClient.java → .../com/baeldung/client/rest/RestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.baeldung.client.rest;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import com.baeldung.server.model.Employee;

Expand Down
4 changes: 2 additions & 2 deletions ...server/config/ApplicationInitializer.java → ...server/config/ApplicationInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.baeldung.server.config;

import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;

import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
Expand Down
4 changes: 2 additions & 2 deletions ...om/baeldung/server/config/RestConfig.java → ...om/baeldung/server/config/RestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.baeldung.server.config;

import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;

import com.baeldung.server.exception.AlreadyExistsExceptionHandler;
import com.baeldung.server.exception.NotFoundExceptionHandler;
Expand Down
6 changes: 3 additions & 3 deletions ...eption/AlreadyExistsExceptionHandler.java → ...eption/AlreadyExistsExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.baeldung.server.exception;

import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
import jakarta.ws.rs.ext.Provider;

@Provider
public class AlreadyExistsExceptionHandler implements ExceptionMapper<EmployeeAlreadyExists> {
Expand Down
0 ...rver/exception/EmployeeAlreadyExists.java → ...rver/exception/EmployeeAlreadyExists.java
View file
Open in desktop
File renamed without changes.
0 ...ng/server/exception/EmployeeNotFound.java → ...ng/server/exception/EmployeeNotFound.java
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...r/exception/NotFoundExceptionHandler.java → ...r/exception/NotFoundExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.baeldung.server.exception;

import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
import jakarta.ws.rs.ext.Provider;

@Provider
public class NotFoundExceptionHandler implements ExceptionMapper<EmployeeNotFound> {
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/baeldung/server/model/Employee.java → ...a/com/baeldung/server/model/Employee.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.baeldung.server.model;

import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;

@XmlRootElement
public class Employee {
Expand Down
0 ...server/repository/EmployeeRepository.java → ...server/repository/EmployeeRepository.java
View file
Open in desktop
File renamed without changes.
0 ...er/repository/EmployeeRepositoryImpl.java → ...er/repository/EmployeeRepositoryImpl.java
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions ...aeldung/server/rest/EmployeeResource.java → ...aeldung/server/rest/EmployeeResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

import java.util.List;

import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.UriInfo;

import org.springframework.beans.factory.annotation.Autowired;

Expand Down
0 spring-jersey/src/main/resources/logback.xml → ...ing-jersey/src/main/resources/logback.xml
View file
Open in desktop
File renamed without changes.
0 .../java/com/baeldung/SpringContextTest.java → .../java/com/baeldung/SpringContextTest.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...baeldung/client/JerseyClientLiveTest.java → ...baeldung/client/JerseyClientLiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static org.junit.Assert.assertEquals;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;

import org.junit.Test;

Expand Down
12 changes: 6 additions & 6 deletions ...x/ClientOrchestrationIntegrationTest.java → ...x/ClientOrchestrationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.InvocationCallback;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.InvocationCallback;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.MediaType;

import org.glassfish.jersey.client.rx.rxjava.RxObservableInvoker;
import org.glassfish.jersey.client.rx.rxjava.RxObservableInvokerProvider;
Expand Down
0 ...om/baeldung/server/JerseyApiLiveTest.java → ...om/baeldung/server/JerseyApiLiveTest.java
View file
Open in desktop
File renamed without changes.