From 352e65d3793f4a71b25ead98955e738d14d087ff Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 6 Jan 2021 13:36:29 -0500 Subject: [PATCH] Updates to boot 2.4.2-SNAPSHOT and cloud 2020.0.1-SNAPSHOT --- bootstrap/pom.xml | 4 ++-- bus/pom.xml | 4 ++-- config-client-decrypt/pom.xml | 4 ++-- config-client-decrypt/src/main/resources/bootstrap.yml | 8 ++++++-- config-client/pom.xml | 4 ++-- config-retry/pom.xml | 4 ++-- configserver-bootstrap/pom.xml | 4 ++-- configserver-eureka/pom.xml | 4 ++-- configserver/pom.xml | 4 ++-- configserver/src/main/resources/application.yml | 8 ++++++-- eureka-client/pom.xml | 4 ++-- eureka-first/pom.xml | 4 ++-- eureka-noweb/pom.xml | 4 ++-- eureka-server/pom.xml | 4 ++-- feign-eager-instantiation/pom.xml | 4 ++-- feign-eureka/pom.xml | 4 ++-- feign/pom.xml | 4 ++-- netflix-sidecar/pom.xml | 4 ++-- noweb/pom.xml | 4 ++-- oauth2-ribbon/pom.xml | 4 ++-- pom.xml | 4 ++-- ribbon-default-config/pom.xml | 4 ++-- ribbon-eureka/pom.xml | 4 ++-- sleuth/pom.xml | 4 ++-- stream-bus/pom.xml | 4 ++-- vanilla/pom.xml | 4 ++-- zipkin/pom.xml | 4 ++-- 27 files changed, 62 insertions(+), 54 deletions(-) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index cf2b39e..420c845 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/bus/pom.xml b/bus/pom.xml index a98c727..199eecf 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml index 700c8b8..e0f71ea 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.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/config-client-decrypt/src/main/resources/bootstrap.yml b/config-client-decrypt/src/main/resources/bootstrap.yml index 468af46..1ec69e5 100644 --- a/config-client-decrypt/src/main/resources/bootstrap.yml +++ b/config-client-decrypt/src/main/resources/bootstrap.yml @@ -2,7 +2,9 @@ debug: true --- spring: - profiles: default + config: + activate: + on-profile: default cloud: config: uri: '{cipher}10360db84ecacacf224df3334b02c85b4490b94ee6e6469bf86dd077aa6667f9b84ee3b60343f2c32d61dc14141fe5d0' @@ -11,7 +13,9 @@ encrypt: --- spring: - profiles: rsa + config: + activate: + on-profile: rsa cloud: config: uri: '{cipher}AQB1ZzADAe6i2ltd857NEc1utA+D6cHjyVs8LusiwwrpMzpmhhss5NthMnNwPS14fOzqb6PVopuxgeMcgnF+bUkH66V3mOlGz9O2xbhWQdt1DBKmstxelqWDNVuE0pNIC6j7GNqBvKmnK1JaIDz2oclkR/YVcxPl6hSTNKXUc+pyrU7cpWEm3As6MMpmwTEU7hBdqFh73baTvHYOAnBTHQK1F85Om4/nOnVluh+Kh1yBWgzBx1wlASORB2IbzTDOuzeGcKGlWPl/s8O4asLNKylXnJOI0DUyq5nyn89LWz3axaEvKCCyZgztobudEpqNRzrttCb4qQ/mfn+rhC/o5wdJBiK76aj9tObDo5PsfCV5g+ZBrlSqiwm2d8gXN/4D4PD9PRtPYs8SuuKecKDjTzrJ' diff --git a/config-client/pom.xml b/config-client/pom.xml index 0919785..e08b6fe 100644 --- a/config-client/pom.xml +++ b/config-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/config-retry/pom.xml b/config-retry/pom.xml index 07d6200..5bda3e9 100644 --- a/config-retry/pom.xml +++ b/config-retry/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml index 59cdb82..e6c0815 100644 --- a/configserver-bootstrap/pom.xml +++ b/configserver-bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml index b84f1c0..277c24b 100644 --- a/configserver-eureka/pom.xml +++ b/configserver-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/configserver/pom.xml b/configserver/pom.xml index 17e0dba..2ed0899 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -32,7 +32,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/configserver/src/main/resources/application.yml b/configserver/src/main/resources/application.yml index ae49656..8d1f584 100644 --- a/configserver/src/main/resources/application.yml +++ b/configserver/src/main/resources/application.yml @@ -13,7 +13,9 @@ spring: --- spring: - profiles: encrypt + config: + activate: + on-profile: encrypt cloud: config: server: @@ -25,7 +27,9 @@ encrypt: --- spring: - profiles: rsa + config: + activate: + on-profile: rsa cloud: config: server: diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml index df460b6..9659669 100644 --- a/eureka-client/pom.xml +++ b/eureka-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml index 73b787e..718a673 100644 --- a/eureka-first/pom.xml +++ b/eureka-first/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml index b0b9a00..6f196fc 100644 --- a/eureka-noweb/pom.xml +++ b/eureka-noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index aa21175..088640b 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml index 2bada1b..af67a5a 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.1 + 2.4.2-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml index c1655e2..aef21d1 100644 --- a/feign-eureka/pom.xml +++ b/feign-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/feign/pom.xml b/feign/pom.xml index 10bb123..f12fc92 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml index f432601..32efd7d 100644 --- a/netflix-sidecar/pom.xml +++ b/netflix-sidecar/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -34,7 +34,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/noweb/pom.xml b/noweb/pom.xml index 2aadcef..49541e8 100644 --- a/noweb/pom.xml +++ b/noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml index 0e82342..0b0ed78 100644 --- a/oauth2-ribbon/pom.xml +++ b/oauth2-ribbon/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6988213..9b5a910 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT spring-cloud-tests - 2020.0.0-SNAPSHOT + 2020.0.1-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 e8acbd7..1235c99 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.1 + 2.4.2-SNAPSHOT @@ -28,7 +28,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml index 48b97da..33fa1c6 100644 --- a/ribbon-eureka/pom.xml +++ b/ribbon-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/sleuth/pom.xml b/sleuth/pom.xml index 9e8ae42..3aea7dd 100644 --- a/sleuth/pom.xml +++ b/sleuth/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml index ddae5ba..2ac368a 100644 --- a/stream-bus/pom.xml +++ b/stream-bus/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/vanilla/pom.xml b/vanilla/pom.xml index 28086de..98029cc 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -33,7 +33,7 @@ UTF-8 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT diff --git a/zipkin/pom.xml b/zipkin/pom.xml index c2d67fb..15ee75c 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.1 + 2.4.2-SNAPSHOT @@ -22,7 +22,7 @@ UTF-8 demo.DemoApplication 1.8 - 2020.0.0-SNAPSHOT + 2020.0.1-SNAPSHOT