diff --git a/.sdkmanrc b/.sdkmanrc
index 4db8676..415f908 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
-java=8.0.292.hs-adpt
+java=17.0.1-tem
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 7633e8c..f39e65d 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -14,14 +14,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/bus/pom.xml b/bus/pom.xml
index 817770a..659fb1b 100644
--- a/bus/pom.xml
+++ b/bus/pom.xml
@@ -14,14 +14,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 251c821..69a0e45 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.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/config-client/pom.xml b/config-client/pom.xml
index a19a772..3f18994 100644
--- a/config-client/pom.xml
+++ b/config-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index 865c7fc..1f852d4 100644
--- a/config-retry/pom.xml
+++ b/config-retry/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml
index 114d6bb..0445b79 100644
--- a/configserver-bootstrap/pom.xml
+++ b/configserver-bootstrap/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -33,8 +33,8 @@
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index 8d3b2b8..28e4362 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -33,8 +33,8 @@
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/configserver/pom.xml b/configserver/pom.xml
index b704e72..90d4312 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -31,8 +31,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml
index c52ee34..6ef8374 100644
--- a/eureka-client/pom.xml
+++ b/eureka-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 81cd8ba..88d77c9 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -33,8 +33,8 @@
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml
index 2013f8c..6fed451 100644
--- a/eureka-noweb/pom.xml
+++ b/eureka-noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index ff7ae73..f940dd1 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -33,8 +33,8 @@
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml
index 6a2301a..ef78337 100644
--- a/feign-eager-instantiation/pom.xml
+++ b/feign-eager-instantiation/pom.xml
@@ -14,15 +14,15 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml
index c04be1a..31a73ac 100644
--- a/feign-eureka/pom.xml
+++ b/feign-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/feign/pom.xml b/feign/pom.xml
index ba703cb..37ad21a 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index a2c0aa1..008917a 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -33,8 +33,8 @@
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/noweb/pom.xml b/noweb/pom.xml
index ba4a52f..987e7df 100644
--- a/noweb/pom.xml
+++ b/noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index 7c9b6ff..9ca3868 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index e46601b..a095da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
spring-cloud-tests
- 2021.0.0-SNAPSHOT
+ 2022.0.0-SNAPSHOT
pom
Spring Cloud Core Tests
Spring Cloud Core Tests
@@ -25,24 +25,24 @@
config-retry
configserver
configserver-bootstrap
- configserver-eureka
- eureka-client
- eureka-first
- eureka-noweb
- eureka-server
+
+
+
+
+
feign
feign-eager-instantiation
- feign-eureka
+
noweb
- sleuth
+
stream-bus
vanilla
- zipkin
+
diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml
index 58df76a..f5eff72 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.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -27,8 +27,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml
index ce89fd6..c921f2a 100644
--- a/ribbon-eureka/pom.xml
+++ b/ribbon-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh
index 430dd50..dc21ba7 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.6.0-SNAPSHOT"
-[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2021.0.0-SNAPSHOT" )"
+CURRENT_BOOT_VERSION="3.0.0-SNAPSHOT"
+[[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2022.0.0-SNAPSHOT" )"
function build() {
echo "Updating parent boot to [${CURRENT_BOOT_VERSION}]"
diff --git a/sleuth/pom.xml b/sleuth/pom.xml
index d8e1c58..7cb869c 100644
--- a/sleuth/pom.xml
+++ b/sleuth/pom.xml
@@ -14,14 +14,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml
index 5fd573f..b848268 100644
--- a/stream-bus/pom.xml
+++ b/stream-bus/pom.xml
@@ -14,14 +14,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
1.15.3
diff --git a/stream-bus/src/main/java/demo/StreamBusApplication.java b/stream-bus/src/main/java/demo/StreamBusApplication.java
index fbfead4..fe39b65 100644
--- a/stream-bus/src/main/java/demo/StreamBusApplication.java
+++ b/stream-bus/src/main/java/demo/StreamBusApplication.java
@@ -2,8 +2,6 @@ package demo;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.messaging.Source;
/**
* @author Dave Syer
diff --git a/vanilla/pom.xml b/vanilla/pom.xml
index d96e25a..bddb6b0 100644
--- a/vanilla/pom.xml
+++ b/vanilla/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
@@ -32,8 +32,8 @@
UTF-8
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 290e3e8..da11eb5 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -14,15 +14,15 @@
org.springframework.boot
spring-boot-starter-parent
- 2.6.0-SNAPSHOT
+ 3.0.0-SNAPSHOT
UTF-8
demo.DemoApplication
- 1.8
- 2021.0.0-SNAPSHOT
+ 17
+ 2022.0.0-SNAPSHOT