From 678da3b21b209d0e222bd5da48e0d733cc59e97e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 4 Jan 2022 12:43:28 -0500 Subject: [PATCH] Updates to version 4.0.0-SNAPSHOT Updates to java 17, framework 6, boot 3 and javax -> jakarta --- .sdkmanrc | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- .../cloud/consul/config/ConsulConfigProperties.java | 6 +++--- spring-cloud-consul-core/pom.xml | 2 +- .../cloud/consul/ConsulProperties.java | 3 +-- spring-cloud-consul-dependencies/pom.xml | 2 +- spring-cloud-consul-discovery/pom.xml | 2 +- .../cloud/consul/discovery/HeartbeatProperties.java | 5 ++--- ...nsulAutoServiceRegistrationAutoConfiguration.java | 2 +- .../ConsulServletRegistrationCustomizer.java | 2 +- spring-cloud-consul-integration-tests/pom.xml | 2 +- .../spring-cloud-consul-bootstrap-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-consul-configdata-tests/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 22 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.sdkmanrc b/.sdkmanrc index 4db86767..415f9083 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/docs/pom.xml b/docs/pom.xml index ae33a709..9c788223 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT spring-cloud-consul-docs jar diff --git a/pom.xml b/pom.xml index cee12489..49740c26 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,17 +14,17 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 1.0.3.RELEASE - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT 3.2.1 1.15.1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index bf0f6d28..c57603b3 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index fc6a358f..c41ef4dd 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java index 87513b92..52d12b81 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConsulConfigProperties.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.annotation.PostConstruct; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.annotation.PostConstruct; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 4f91696b..1deb80f1 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java index f898be83..57d0388d 100644 --- a/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java +++ b/spring-cloud-consul-core/src/main/java/org/springframework/cloud/consul/ConsulProperties.java @@ -16,9 +16,8 @@ package org.springframework.cloud.consul; -import javax.validation.constraints.NotNull; - import com.ecwid.consul.transport.TLSConfig.KeyStoreInstanceType; +import jakarta.validation.constraints.NotNull; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.style.ToStringCreator; diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index c5ee50ac..d76fb716 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-consul-dependencies - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index b6088071..f2b88936 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java index 36dfa62a..75bac1c6 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java @@ -19,9 +19,8 @@ package org.springframework.cloud.consul.discovery; import java.time.Duration; import java.time.temporal.ChronoUnit; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.DecimalMin; - +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; import org.apache.commons.logging.Log; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java index f2d13acb..80e5bf81 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulAutoServiceRegistrationAutoConfiguration.java @@ -18,7 +18,7 @@ package org.springframework.cloud.consul.serviceregistry; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java index 1039422c..00f2499e 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServletRegistrationCustomizer.java @@ -19,7 +19,7 @@ package org.springframework.cloud.consul.serviceregistry; import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.springframework.beans.factory.ObjectProvider; import org.springframework.util.StringUtils; diff --git a/spring-cloud-consul-integration-tests/pom.xml b/spring-cloud-consul-integration-tests/pom.xml index 1cc19971..b916c872 100644 --- a/spring-cloud-consul-integration-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-consul-integration-tests diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index a8a84c4d..236f5963 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 4ce78352..50f81cca 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index e6da3c66..c4eb5f7c 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul-integration-tests - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 58cca6c3..7c4c0af0 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index f223a36e..7cafccc1 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 5f4dde4f..a6a7184a 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 0c9ae65c..63f05b05 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index b404ed3c..57f3b42d 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT .. spring-cloud-starter-consul