diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java index 188c6a67..26fc65e8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/CompatibilityVerifierProperties.java @@ -36,7 +36,7 @@ public class CompatibilityVerifierProperties { * the patch version if you don't want to specify a concrete value. Example: * {@code 3.4.x} */ - private List compatibleBootVersions = List.of("3.0.x", "3.1.x"); + private List compatibleBootVersions = List.of("3.2.x"); public boolean isEnabled() { return this.enabled; 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 435868df..d0f90e0a 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 @@ -36,8 +36,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { final Map ACCEPTED_VERSIONS = new HashMap<>() { { - this.put("3.0", is3_0()); - this.put("3.1", is3_1()); + this.put("3.2", is3_2()); } }; @@ -72,26 +71,27 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { return SpringBootVersion.getVersion(); } - CompatibilityPredicate is3_0() { + CompatibilityPredicate is3_2() { return new CompatibilityPredicate() { @Override public String toString() { - return "Predicate for Boot 3.0"; + return "Predicate for Boot 3.2"; } @Override public boolean isCompatible() { - try { - // since 3.0 - Class.forName( - "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"); - return true; + // try { + // since 3.2 + // TODO: find new class/method in boot since 3.2 + // Class.forName( + // "org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer"); + return true; - } - catch (ClassNotFoundException e) { - return false; - } + // } + // catch (ClassNotFoundException e) { + // return false; + // } } }; 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 b6327062..238152a6 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 @@ -176,18 +176,18 @@ public class SpringBootDependencyTests { @Test public void should_match_against_current_manifest() { try { - verifyCurrentVersionFromManifest("3.0"); - verifyCurrentVersionFromManifest("3.0.x"); + verifyCurrentVersionFromManifest("3.2"); + verifyCurrentVersionFromManifest("3.2.x"); } catch (AssertionError e) { - if (e.getMessage() != null && e.getMessage().contains("3.1.")) { - // we're likely running a boot 3.1 compatibility test, try 3.1 - verifyCurrentVersionFromManifest("3.1"); - verifyCurrentVersionFromManifest("3.1.x"); - } - else { - throw e; - } + // if (e.getMessage() != null && e.getMessage().contains("3.3.")) { + // we're likely running a boot 3.3 compatibility test, try 3.3 + // verifyCurrentVersionFromManifest("3.3"); + // verifyCurrentVersionFromManifest("3.3.x"); + // } + // else { + throw e; + // } } } @@ -212,7 +212,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_0()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2()); VerificationResult verificationResult = versionVerifier.verify(); @@ -230,7 +230,7 @@ public class SpringBootDependencyTests { } }; versionVerifier.ACCEPTED_VERSIONS.clear(); - versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_0()); + versionVerifier.ACCEPTED_VERSIONS.put("3.0", versionVerifier.is3_2()); VerificationResult verificationResult = versionVerifier.verify();