iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Java 4341 upgrade spring cloud  modules
This commit is contained in:
Loredana Crusoveanu
2021-04-12 17:43:17 +03:00
committed by GitHub
parent 7416e437fc 8c4ca7fd8c
commit f203051ccd
30 changed files with 55 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml
+3 -9
View File
@@ -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.0.0.RELEASE</spring.cloud.k8s.version>
<spring.cloud.k8s.version>1.1.8.RELEASE</spring.cloud.k8s.version>
</properties>
</project>
spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java
+1 -4
View File
@@ -1,13 +1,10 @@
package com.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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
-8
View File
@@ -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 -4
View File
@@ -1,12 +1,9 @@
package com.baeldung.spring.cloud.kubernetes.travelagency;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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 -4
View File
@@ -1,13 +1,10 @@
package com.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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 -4
View File
@@ -1,13 +1,10 @@
package com.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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 -4
View File
@@ -1,12 +1,9 @@
package com.baeldung;
import com.baeldung.liveness.Application;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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 -4
View File
@@ -1,12 +1,9 @@
package com.baeldung;
import com.baeldung.readiness.Application;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
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
+13 -1
View File
@@ -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>