diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java index 69f64a12..861b2540 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java @@ -40,6 +40,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { this.put("2.0", is2_0()); this.put("2.1", is2_1()); this.put("2.2", is2_2()); + this.put("2.3", is2_3()); } }; @@ -162,6 +163,30 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { }; } + CompatibilityPredicate is2_3() { + return new CompatibilityPredicate() { + + @Override + public String toString() { + return "Predicate for Boot 2.3"; + } + + @Override + public boolean isCompatible() { + try { + // since 2.3 + Class.forName( + "org.springframework.boot.context.propertie.BoundConfigurationProperties"); + return true; + } + catch (ClassNotFoundException e) { + return false; + } + + } + }; + } + private String errorDescription() { String versionFromManifest = getVersionFromManifest(); if (StringUtils.hasText(versionFromManifest)) { diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java index ecad2c70..dbcadab9 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java @@ -144,7 +144,7 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_manifest() { - List acceptedVersions = Collections.singletonList("2.2"); + List acceptedVersions = Collections.singletonList("2.3"); SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier( acceptedVersions); versionVerifier.ACCEPTED_VERSIONS.clear(); diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index 4411e44b..9ca54cbe 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -22,6 +22,10 @@ org.springframework.cloud spring-cloud-context + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot spring-boot-starter-actuator