diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index e0c3bc5..e88878f 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -51,13 +51,18 @@
org.springframework.cloud
- spring-cloud-starter
+ spring-cloud-starter-bootstrap
org.springframework.boot
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java b/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
index 50daed2..fe8ac22 100644
--- a/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
+++ b/bootstrap/src/test/java/demo/BootstrapClientApplicationTests.java
@@ -21,7 +21,7 @@ public class BootstrapClientApplicationTests {
@Test
public void contextLoads() throws Exception {
- assertEquals(2, this.server.getTomcat().getMaxThreads());
+ assertEquals(2, this.server.getTomcat().getThreads().getMax());
// The application.yml is never read because spring.config.name=sample
assertEquals("application", this.server.getServlet().getApplicationDisplayName());
}
diff --git a/bus/pom.xml b/bus/pom.xml
index 7dfc3b9..378c94d 100644
--- a/bus/pom.xml
+++ b/bus/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -45,6 +45,10 @@
org.springframework.cloud
spring-cloud-starter-config
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
org.springframework.cloud
spring-cloud-starter-bus-amqp
@@ -58,6 +62,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 46d9e82..36911fb 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -57,6 +57,10 @@
org.springframework.cloud
spring-cloud-starter-config
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
org.springframework.security
spring-security-crypto
@@ -70,6 +74,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/config-client/pom.xml b/config-client/pom.xml
index 5c22abb..1b99357 100644
--- a/config-client/pom.xml
+++ b/config-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -57,11 +57,20 @@
org.springframework.cloud
spring-cloud-starter-config
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
org.springframework.boot
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index 54aa301..87e8ad5 100644
--- a/config-retry/pom.xml
+++ b/config-retry/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -57,6 +57,10 @@
org.springframework.cloud
spring-cloud-starter-config
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
org.springframework.retry
spring-retry
@@ -80,6 +84,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml
index e0ae85c..19a0e75 100644
--- a/configserver-bootstrap/pom.xml
+++ b/configserver-bootstrap/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -42,11 +42,20 @@
org.springframework.cloud
spring-cloud-config-server
+
+ org.springframework.cloud
+ spring-cloud-starter-bootstrap
+
org.springframework.boot
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index 4f5b92d..f8f8db3 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -51,6 +51,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/configserver/pom.xml b/configserver/pom.xml
index f64acd8..3adedc4 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -45,6 +45,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml
index 878323b..a91bf00 100644
--- a/eureka-client/pom.xml
+++ b/eureka-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -70,6 +70,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 4e58684..3162100 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -55,6 +55,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml
index 3ca3f0f..6abc53f 100644
--- a/eureka-noweb/pom.xml
+++ b/eureka-noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -83,6 +83,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index c06e51d..85010b8 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -51,6 +51,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml
index 3d38758..86cf30b 100644
--- a/feign-eager-instantiation/pom.xml
+++ b/feign-eager-instantiation/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -39,6 +39,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml
index 7ccacc7..1fcc6cc 100644
--- a/feign-eureka/pom.xml
+++ b/feign-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -70,6 +70,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/feign/pom.xml b/feign/pom.xml
index 36fa14a..20d5903 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -50,6 +50,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
org.springframework.boot
spring-boot-starter-web
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index 9f52434..a575e7a 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
diff --git a/noweb/pom.xml b/noweb/pom.xml
index 53f3952..17d73a7 100644
--- a/noweb/pom.xml
+++ b/noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -62,6 +62,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index 28b1764..89c761a 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 14bb581..2e48a20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
spring-cloud-tests
diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml
index f321333..050f279 100644
--- a/ribbon-default-config/pom.xml
+++ b/ribbon-default-config/pom.xml
@@ -4,7 +4,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml
index c78a7be..459dde4 100644
--- a/ribbon-eureka/pom.xml
+++ b/ribbon-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
diff --git a/sleuth/pom.xml b/sleuth/pom.xml
index 6d52819..0af01f8 100644
--- a/sleuth/pom.xml
+++ b/sleuth/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -54,6 +54,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml
index 05b0c1f..37342dc 100644
--- a/stream-bus/pom.xml
+++ b/stream-bus/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -58,6 +58,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/vanilla/pom.xml b/vanilla/pom.xml
index 8dc1356..8306ce5 100644
--- a/vanilla/pom.xml
+++ b/vanilla/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -70,6 +70,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 85b7594..2152c10 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.3.1.BUILD-SNAPSHOT
+ 2.4.0-SNAPSHOT
@@ -55,6 +55,11 @@
spring-boot-starter-test
test
+
+ org.junit.vintage
+ junit-vintage-engine
+ test
+