From 1048e479d905e6472145a0fa50e152ad8a2ae62b Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Sat, 12 Jun 2021 13:20:07 +0530
Subject: [PATCH 1/3] JAVA-5619 - Updated Spring Boot Hikari version

---
 spring-4/pom.xml | 3 ++-
 spring-5/pom.xml | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index 21de925d99..be030a0abd 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -52,7 +53,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <!-- Check for the most recent available version: https://projectlombok.org/changelog.html -->
+            <version>1.18.20</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index 5ebeb4dadf..e1adb866d4 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -96,6 +96,11 @@
             <artifactId>spring-restdocs-restassured</artifactId>
             <scope>test</scope>
         </dependency>
+		<dependency>
+			<groupId>com.zaxxer</groupId>
+			<artifactId>HikariCP</artifactId>
+			<version>4.0.3</version>
+		</dependency>
     </dependencies>
 
     <build>

From 7100f2b02a8a659cfc5a7749489f561ca5948799 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Fri, 18 Jun 2021 13:31:54 +0530
Subject: [PATCH 2/3] JAVA-5619 Feedback changes.

---
 spring-4/pom.xml | 4 ++--
 spring-5/pom.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index be030a0abd..c17ded04fd 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>4.0.3</version>
+            <version>${hikaricp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -53,7 +53,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -114,6 +113,7 @@
         <flips-web.version>1.0.1</flips-web.version>
         <easymock.version>3.6</easymock.version>
         <hsqldb.version>2.4.0</hsqldb.version>
+        <hikaricp.version>4.0.3</hikaricp.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-5/pom.xml b/spring-5/pom.xml
index e1adb866d4..2284177dc0 100644
--- a/spring-5/pom.xml
+++ b/spring-5/pom.xml
@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>4.0.3</version>
+			<version>${hikaricp.version}</version>
 		</dependency>
     </dependencies>
 
@@ -144,6 +144,7 @@
         <asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
         <commons-collections4.version>4.1</commons-collections4.version>
         <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
+        <hikaricp.version>4.0.3</hikaricp.version>
     </properties>
 
 </project>
\ No newline at end of file

From 1fa69099cd453490c4bfa5ac942daa68cf54d6f1 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Fri, 18 Jun 2021 13:35:56 +0530
Subject: [PATCH 3/3] JAVA-5619 Reverting comment

---
 spring-4/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index c17ded04fd..41f55ea13b 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <!-- Check for the most recent available version: https://projectlombok.org/changelog.html -->
             <scope>provided</scope>
         </dependency>
         <dependency>