From d3bb687d76f563c3f856d0b1a6685009653b3166 Mon Sep 17 00:00:00 2001
From: Amit Pandey <amit2103@users.noreply.github.com>
Date: Mon, 11 Mar 2024 03:11:00 +0530
Subject: [PATCH] JAVA-30995 :- Upgrade to Spring boot 3 and fix tests not
 passing (#16088)

---
 spring-boot-modules/pom.xml                 | 2 +-
 spring-boot-modules/spring-boot-jsp/pom.xml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 49f9a0a43a..4504aff083 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -45,7 +45,7 @@
         <!--<module>spring-boot-groovy</module>--> <!-- failing after upgrading to jdk17-->
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-jasypt</module>
-<!--        <module>spring-boot-jsp</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+        <module>spring-boot-jsp</module>
         <module>spring-boot-keycloak</module>
         <module>spring-boot-keycloak-2</module>
         <!--        <module>spring-boot-libraries</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
diff --git a/spring-boot-modules/spring-boot-jsp/pom.xml b/spring-boot-modules/spring-boot-jsp/pom.xml
index f4230a12f1..717267cfd3 100644
--- a/spring-boot-modules/spring-boot-jsp/pom.xml
+++ b/spring-boot-modules/spring-boot-jsp/pom.xml
@@ -55,6 +55,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -101,8 +102,9 @@
 
     <properties>
         <jstl.version>1.2</jstl.version>
-        <spring-boot.version>2.4.4</spring-boot.version>
+        <spring-boot.version>3.2.2</spring-boot.version>
         <commons-text.version>1.10.0</commons-text.version>
+        <junit-jupiter.version>5.10.2</junit-jupiter.version>
     </properties>
 
 </project>
\ No newline at end of file