Merge pull request #10321 from kwoyke/JAVA-3570

JAVA-3570: Update Mockito version in the parent-boot-2 to match Sprin…

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>

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>
 

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>

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>