From 2b7e938e090500d2a970afae1d55f5edf95045b3 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Tue, 24 Oct 2023 14:40:19 +0530
Subject: [PATCH 1/2] JAVA-26379 Change parent of spring-web-modules to
 parent-spring-5

---
 spring-web-modules/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml
index 9f03b83392..2be896ad83 100644
--- a/spring-web-modules/pom.xml
+++ b/spring-web-modules/pom.xml
@@ -10,8 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
     </parent>
 
     <modules>

From f182b714a94aa0315dc770616f6af7a1b34b803a Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Wed, 25 Oct 2023 22:42:51 +0530
Subject: [PATCH 2/2] JAVA-26379 Fix failing test

---
 spring-web-modules/spring-mvc-xml-2/pom.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spring-web-modules/spring-mvc-xml-2/pom.xml b/spring-web-modules/spring-mvc-xml-2/pom.xml
index f4326ccf68..8c0062f538 100644
--- a/spring-web-modules/spring-mvc-xml-2/pom.xml
+++ b/spring-web-modules/spring-mvc-xml-2/pom.xml
@@ -19,12 +19,12 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <!-- web -->
         <dependency>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot.version}</version>
+            <version>${spring-boot-starter-test.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -95,8 +95,6 @@
     </build>
 
     <properties>
-        <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
-        <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
         <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>