diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index e6616aa..7633e8c 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/bus/pom.xml b/bus/pom.xml index dcbe043..817770a 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml index 42964a3..251c821 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.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/config-client/pom.xml b/config-client/pom.xml index 6ef033f..a19a772 100644 --- a/config-client/pom.xml +++ b/config-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/config-retry/pom.xml b/config-retry/pom.xml index 699b533..865c7fc 100644 --- a/config-retry/pom.xml +++ b/config-retry/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml index ec78f4a..114d6bb 100644 --- a/configserver-bootstrap/pom.xml +++ b/configserver-bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml index 73d4793..8d3b2b8 100644 --- a/configserver-eureka/pom.xml +++ b/configserver-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/configserver/pom.xml b/configserver/pom.xml index 3e3418c..b704e72 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -32,7 +32,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml index a90f03a..c52ee34 100644 --- a/eureka-client/pom.xml +++ b/eureka-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml index e72644d..81cd8ba 100644 --- a/eureka-first/pom.xml +++ b/eureka-first/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml index f530734..2013f8c 100644 --- a/eureka-noweb/pom.xml +++ b/eureka-noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index ad7fc01..ff7ae73 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml index cd47cdf..6a2301a 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.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml index 759b0d4..c04be1a 100644 --- a/feign-eureka/pom.xml +++ b/feign-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/feign/pom.xml b/feign/pom.xml index 157d8a1..ba703cb 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml index a603760..a2c0aa1 100644 --- a/netflix-sidecar/pom.xml +++ b/netflix-sidecar/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/noweb/pom.xml b/noweb/pom.xml index e2e9dbb..ba4a52f 100644 --- a/noweb/pom.xml +++ b/noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml index a9c6d00..7c9b6ff 100644 --- a/oauth2-ribbon/pom.xml +++ b/oauth2-ribbon/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 38e745c..e46601b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT spring-cloud-tests - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT pom Spring Cloud Core Tests Spring Cloud Core Tests diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml index aeb2d98..58df76a 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.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -28,7 +28,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml index 8a633a7..ce89fd6 100644 --- a/ribbon-eureka/pom.xml +++ b/ribbon-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index 106fcb4..430dd50 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -21,8 +21,8 @@ function cloudVersion() { CURRENT_BOOT_VERSION="${CURRENT_BOOT_VERSION:-}" CURRENT_CLOUD_VERSION="${CURRENT_CLOUD_VERSION:-}" #[[ -z "${CURRENT_BOOT_VERSION}" ]] && CURRENT_BOOT_VERSION="$( bootVersion "2.4" )" -CURRENT_BOOT_VERSION="2.4.7-SNAPSHOT" -[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2020.0.4-SNAPSHOT" )" +CURRENT_BOOT_VERSION="2.6.0-SNAPSHOT" +[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2021.0.0-SNAPSHOT" )" function build() { echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]" diff --git a/sleuth/pom.xml b/sleuth/pom.xml index 86584a9..d8e1c58 100644 --- a/sleuth/pom.xml +++ b/sleuth/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml index c5fde13..5fd573f 100644 --- a/stream-bus/pom.xml +++ b/stream-bus/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT 1.15.3 diff --git a/vanilla/pom.xml b/vanilla/pom.xml index 6f244ac..d96e25a 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT diff --git a/zipkin/pom.xml b/zipkin/pom.xml index 1292d91..290e3e8 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.6.0-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.4-SNAPSHOT + 2021.0.0-SNAPSHOT