From 5cd874b4cef9cd51e6df805ed4a411346757a0c6 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Sun, 7 Apr 2024 12:07:35 +0300
Subject: [PATCH] JAVA-29509 Changed parent from parent-boot-2 to
 parent-spring-5 (#16307)

---
 spring-core-2/pom.xml                         | 61 +++++++++----------
 .../ConcurrentRequestApplication.java         | 11 ----
 .../ConcurrentRequestManualTest.java          |  6 +-
 .../version/VersionObtainerUnitTest.java      |  2 -
 spring-core-4/pom.xml                         |  1 -
 5 files changed, 34 insertions(+), 47 deletions(-)
 delete mode 100644 spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java

diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index d22178004c..e05b839f00 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -10,52 +10,57 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-spring-5</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
         <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>
             <artifactId>spring-retry</artifactId>
+            <version>${spring-retry.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-websocket</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-messaging</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -66,41 +71,30 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
+            <version>${spring.version}</version>
         </dependency>
         <!-- persistence -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
             <version>${javassist.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-        </dependency>
         <!-- validation -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate.version}</version>
         </dependency>
         <!-- web -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>runtime</scope>
+            <version>${servlet-api.version}</version>
         </dependency>
         <!-- util -->
         <dependency>
@@ -112,11 +106,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,6 +114,12 @@
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <version>${spring-boot.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -147,12 +143,15 @@
     </build>
 
     <properties>
-        <start-class>com.baeldung.sample.App</start-class>
         <annotation-api.version>1.3.2</annotation-api.version>
+        <servlet-api.version>4.0.0</servlet-api.version>
+        <hibernate.version>6.2.5.Final</hibernate.version>
         <!-- util -->
         <easymock.version>3.6</easymock.version>
         <javassist.version>3.22.0-GA</javassist.version>
         <maven-war-plugin.version.version>3.2.2</maven-war-plugin.version.version>
+        <spring-retry.version>2.0.5</spring-retry.version>
+        <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java b/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java
deleted file mode 100644
index 21d031555b..0000000000
--- a/spring-core-2/src/main/java/com/baeldung/concurrentrequest/ConcurrentRequestApplication.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.baeldung.concurrentrequest;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ConcurrentRequestApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(ConcurrentRequestApplication.class, args);
-    }
-}
diff --git a/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java b/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
index e7a3d0fc1a..1bd8a13836 100644
--- a/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/concurrentrequest/ConcurrentRequestManualTest.java
@@ -4,20 +4,22 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Test need to pause the main thread for up to 60 seconds
  */
+
 @SpringBootTest
 @AutoConfigureMockMvc
 public class ConcurrentRequestManualTest {
diff --git a/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
index af074d5783..96ca803580 100644
--- a/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
+++ b/spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java
@@ -3,9 +3,7 @@ package com.baeldung.version;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = VersionObtainer.class)
 public class VersionObtainerUnitTest {
 
     public VersionObtainer version = new VersionObtainer();
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index fb544e29fd..5e86542224 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -80,7 +80,6 @@
 
     <properties>
         <annotation-api.version>1.3.2</annotation-api.version>
-        <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
         <awaitility.version>4.0.2</awaitility.version>
         <servlet-api.version>4.0.0</servlet-api.version>
         <annotation-api.version>1.3.2</annotation-api.version>