From 8711ec8f296d05dafd707c38fe96f77edeb890a0 Mon Sep 17 00:00:00 2001
From: vunamtien <vunamtien16@gmail.com>
Date: Fri, 29 Mar 2024 20:25:16 +0700
Subject: [PATCH] [JAVA-32058] Upgrade spring-rest-http-2, spring-rest-http-3
 to Boot 3 (#16225)

---
 spring-web-modules/spring-rest-http-2/pom.xml             | 5 +++--
 .../src/main/java/com/baeldung/putvspost/Address.java     | 6 +++---
 .../java/com/baeldung/requesttimeout/domain/Book.java     | 4 ++--
 .../main/java/com/baeldung/unsupportedmediatype/User.java | 2 +-
 .../requesttimeout/RequestTimeoutIntegrationTest.java     | 2 +-
 spring-web-modules/spring-rest-http-3/pom.xml             | 8 ++++++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/spring-web-modules/spring-rest-http-2/pom.xml b/spring-web-modules/spring-rest-http-2/pom.xml
index c6c8cd2010..588e121162 100644
--- a/spring-web-modules/spring-rest-http-2/pom.xml
+++ b/spring-web-modules/spring-rest-http-2/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -53,6 +53,7 @@
         <swagger2.version>2.9.2</swagger2.version>
         <resilience4j.version>2.1.0</resilience4j.version>
         <springdoc.version>1.7.0</springdoc.version>
+        <start-class>com.baeldung.Main</start-class>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/putvspost/Address.java b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/putvspost/Address.java
index 5c005c70f0..7c93b36b27 100644
--- a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/putvspost/Address.java
+++ b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/putvspost/Address.java
@@ -1,8 +1,8 @@
 package com.baeldung.putvspost;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Address {
diff --git a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/requesttimeout/domain/Book.java b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/requesttimeout/domain/Book.java
index 846bfb2cec..710cafd175 100644
--- a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/requesttimeout/domain/Book.java
+++ b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/requesttimeout/domain/Book.java
@@ -1,7 +1,7 @@
 package com.baeldung.requesttimeout.domain;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class Book {
diff --git a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/unsupportedmediatype/User.java b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/unsupportedmediatype/User.java
index 765149dad5..4db6ae7bc9 100644
--- a/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/unsupportedmediatype/User.java
+++ b/spring-web-modules/spring-rest-http-2/src/main/java/com/baeldung/unsupportedmediatype/User.java
@@ -1,6 +1,6 @@
 package com.baeldung.unsupportedmediatype;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 
 @XmlRootElement
diff --git a/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
index d30dc351fa..6fd56bf89c 100644
--- a/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
+++ b/spring-web-modules/spring-rest-http-2/src/test/java/com/baeldung/requesttimeout/RequestTimeoutIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
diff --git a/spring-web-modules/spring-rest-http-3/pom.xml b/spring-web-modules/spring-rest-http-3/pom.xml
index 2de635c1f1..f9f9b35a3b 100644
--- a/spring-web-modules/spring-rest-http-3/pom.xml
+++ b/spring-web-modules/spring-rest-http-3/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -26,4 +26,8 @@
         </dependency>
     </dependencies>
 
+    <properties>
+        <start-class>com.baeldung.Main</start-class>
+    </properties>
+
 </project>
\ No newline at end of file