From 35b8de3a5fef91ca64758b3dcb23d0e3ef836e83 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Sat, 19 Dec 2020 23:07:14 +0100
Subject: [PATCH 1/4] JAVA-3570: Update Mockito version in the parent-boot-2 to
 match Spring Boot 2.4

---
 parent-boot-2/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 2ee4f1483b..ace3e538c9 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -84,6 +84,8 @@
         <thin.version>1.0.22.RELEASE</thin.version>
         <spring-boot.version>2.4.0</spring-boot.version>
         <aspectjweaver.version>1.9.1</aspectjweaver.version>
+        <!-- this property can be removed once we update Mockito version in the main pom.xml -->
+        <mockito.version>3.4.0</mockito.version>
     </properties>
 
 </project>

From 0ee156ff9235d2f696b1ba3dd50e505c2bb1ddc3 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Sat, 19 Dec 2020 23:15:22 +0100
Subject: [PATCH 2/4] JAVA-3570: Remove unused spring-cloud-context dependency
 from spring-mvc-basics-3

---
 spring-mvc-basics-3/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spring-mvc-basics-3/pom.xml b/spring-mvc-basics-3/pom.xml
index a929337b25..fac6f54a16 100644
--- a/spring-mvc-basics-3/pom.xml
+++ b/spring-mvc-basics-3/pom.xml
@@ -78,12 +78,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <version>${springcloud.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -149,7 +143,6 @@
         <jpa.version>2.2</jpa.version>
         <guava.version>18.0</guava.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
-        <springcloud.version>2.0.2.RELEASE</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
     </properties>
 

From 00e15a4911ae4b34efcb0c15def916352228ea91 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Sat, 19 Dec 2020 23:21:02 +0100
Subject: [PATCH 3/4] JAVA-3570: Remove unused spring-cloud-context dependency
 from spring-boot-artifacts

---
 spring-boot-modules/spring-boot-artifacts/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spring-boot-modules/spring-boot-artifacts/pom.xml b/spring-boot-modules/spring-boot-artifacts/pom.xml
index 2704b71bd6..467f931559 100644
--- a/spring-boot-modules/spring-boot-artifacts/pom.xml
+++ b/spring-boot-modules/spring-boot-artifacts/pom.xml
@@ -86,12 +86,6 @@
             <version>${jquery.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <version>${springcloud.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -216,7 +210,6 @@
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <guava.version>18.0</guava.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
-        <springcloud.version>2.0.2.RELEASE</springcloud.version>
         <httpclient.version>4.5.8</httpclient.version>
     </properties>
 

From e2026cf43e7c537d5c5be35a7d051e50200b98d5 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Sat, 19 Dec 2020 23:27:59 +0100
Subject: [PATCH 4/4] JAVA-3570: Update JaVers version in spring-boot-data

---
 spring-boot-modules/spring-boot-data/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-modules/spring-boot-data/pom.xml b/spring-boot-modules/spring-boot-data/pom.xml
index fe64b07379..06f09c70fe 100644
--- a/spring-boot-modules/spring-boot-data/pom.xml
+++ b/spring-boot-modules/spring-boot-data/pom.xml
@@ -168,7 +168,7 @@
     </profiles>
 
     <properties>
-        <javers.version>5.6.3</javers.version>
+        <javers.version>5.14.0</javers.version>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>