Merge pull request #10604 from Maiklins/JAVA-4341-Upgrade_spring-cloud-_modules

Java 4341 upgrade spring cloud  modules

spring-cloud/pom.xml

@@ -78,7 +78,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
         <spring-cloud-starter-config.version>2.2.3.RELEASE</spring-cloud-starter-config.version>
         <spring-cloud-config-server.version>2.2.3.RELEASE</spring-cloud-config-server.version>
         <spring-cloud-starter-eureka.version>1.4.7.RELEASE</spring-cloud-starter-eureka.version>

spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung.spring.cloud.hystrix.rest.consumer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = RestConsumerFeignApplication.class)
 @WebAppConfiguration
 public class SpringContextTest {

spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml

@@ -11,7 +11,7 @@
         <groupId>com.baeldung.spring.cloud</groupId>
         <artifactId>spring-cloud-hystrix</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+        <relativePath>../</relativePath>
     </parent>
 
     <dependencyManagement>

spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung.spring.cloud.hystrix.rest.consumer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
-@RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = RestConsumerApplication.class)
 @WebAppConfiguration
 public class SpringContextTest {

spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java

@@ -1,11 +1,8 @@
 package com.baeldung.spring.cloud.hystrix.rest.producer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml

@@ -15,13 +15,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-kubernetes-dependencies</artifactId>
@@ -57,6 +50,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <version>2.2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -65,6 +59,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <version>2.2.7.RELEASE</version>
         </dependency>
     </dependencies>
 
@@ -89,8 +84,7 @@
     </build>
 
     <properties>
-        <spring-cloud-dependencies.version>Hoxton.SR1</spring-cloud-dependencies.version>
+        <spring.cloud.k8s.version>1.1.8.RELEASE</spring.cloud.k8s.version>
-        <spring.cloud.k8s.version>1.0.0.RELEASE</spring.cloud.k8s.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,10 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.spring.cloud.kubernetes.client.Application;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml

@@ -14,13 +14,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
@@ -70,7 +63,6 @@
     </build>
 
     <properties>
-        <spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
         <logback.version>1.2.3</logback.version>
     </properties>
 

spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung.spring.cloud.kubernetes.travelagency;
 
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringContextTest {
     

spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,10 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.spring.cloud.kubernetes.backend.KubernetesBackendApplication;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = KubernetesBackendApplication.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,10 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.spring.cloud.kubernetes.frontend.KubernetesFrontendApplication;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = KubernetesFrontendApplication.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung;
 
 import com.baeldung.liveness.Application;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung;
 
 import com.baeldung.readiness.Application;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-kubernetes/pom.xml

@@ -15,6 +15,18 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>kubernetes-minikube/demo-frontend</module>
         <module>kubernetes-minikube/demo-backend</module>
@@ -25,6 +37,6 @@
     </modules>
 
     <properties>
-        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
     </properties>
 </project>

spring-cloud/spring-cloud-ribbon-client/pom.xml

@@ -37,6 +37,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+            <version>2.2.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,8 +46,7 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
-        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,10 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.spring.cloud.ribbon.client.ServerLocationApp;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = ServerLocationApp.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-security/auth-client/pom.xml

@@ -13,30 +13,15 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+            <version>${spring-cloud-starter-netflix-zuul.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -92,7 +77,7 @@
 
     <properties>
         <js-cookie.version>2.2.0</js-cookie.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-cloud-starter-netflix-zuul.version>2.2.7.RELEASE</spring-cloud-starter-netflix-zuul.version>
         <jquery.version>3.4.1</jquery.version>
         <bootstrap.version>4.3.1</bootstrap.version>
     </properties>

spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,8 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.CloudSite;
-
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = CloudSite.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java

@@ -1,13 +1,10 @@
 package com.baeldung.example.springoath2;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import com.baeldung.CloudSite;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = CloudSite.class)
 public class Springoath2ApplicationIntegrationTest {
 

spring-cloud/spring-cloud-security/auth-resource/pom.xml

@@ -13,18 +13,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -56,7 +44,6 @@
     </build>
 
     <properties>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
         <spring-jwt.version>1.0.10.RELEASE</spring-jwt.version>
     </properties>
 

spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,8 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.Application;
-
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java

@@ -1,11 +1,8 @@
 package com.baeldung.service.personservice;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class PersonserviceApplicationIntegrationTest {
 

spring-cloud/spring-cloud-security/auth-server/pom.xml

@@ -31,14 +31,9 @@
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>org.springframework.security.oauth.boot</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <artifactId>spring-security-oauth2-autoconfigure</artifactId>
-            <version>${spring-cloud-starter-oauth2.version}</version>
         </dependency>
     </dependencies>
 
-    <properties>
-        <spring-cloud-starter-oauth2.version>2.1.2.RELEASE</spring-cloud-starter-oauth2.version>
-    </properties>
-
 </project>

spring-cloud/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,13 +1,8 @@
 package com.baeldung;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.AuthServer;
-
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = AuthServer.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-security/pom.xml

@@ -14,6 +14,18 @@
         <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>auth-client</module>
         <module>auth-resource</module>
@@ -21,6 +33,7 @@
     </modules>
 
     <properties>
-        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
+        <spring-cloud-dependencies.version>2020.0.1</spring-cloud-dependencies.version>
     </properties>
+
 </project>

spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml

@@ -37,12 +37,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-            <version>${spring-cloud-starter-zookeeper-discovery.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>

spring-cloud/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung;
 
 import com.baeldung.spring.cloud.greeting.GreetingApplication;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = GreetingApplication.class)
 public class SpringContextTest {
 

spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml

@@ -33,12 +33,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>${springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
-            <version>${spring-cloud-starter-zookeeper-discovery.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-logging</artifactId>

spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java

@@ -1,12 +1,9 @@
 package com.baeldung.spring.cloud.helloworld;
 
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = HelloWorldApplication.class)
 public class SpringContextTest {
     

spring-cloud/spring-cloud-zookeeper/pom.xml

@@ -19,8 +19,6 @@
 
     <properties>
         <springframework.version>5.2.7.RELEASE</springframework.version>
-        <spring-cloud-starter-zookeeper-discovery.version>1.0.3.RELEASE</spring-cloud-starter-zookeeper-discovery.version>
-        <spring-boot.version>2.3.3.RELEASE</spring-boot.version>
     </properties>
 
 </project>