Adds support for Spring Boot 3.3

Fixes gh-1343

Author: spencergibb

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<String> compatibleBootVersions = List.of("3.2.x");
+	private List<String> compatibleBootVersions = List.of("3.2.x", "3.3.x");
 
 	public boolean isEnabled() {
 		return this.enabled;

spring-cloud-commons/src/main/java/org/springframework/cloud/configuration/SpringBootVersionVerifier.java

@@ -24,7 +24,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.boot.SpringBootVersion;
-import org.springframework.boot.autoconfigure.validation.ValidationConfigurationCustomizer;
 import org.springframework.util.StringUtils;
 
 /**
@@ -37,6 +36,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
 	final Map<String, CompatibilityPredicate> ACCEPTED_VERSIONS = new HashMap<>() {
 		{
 			this.put("3.2", is3_2());
+			this.put("3.3", is3_3());
 		}
 	};
 
@@ -88,31 +88,27 @@ public boolean isCompatible() {
 				catch (ClassNotFoundException e) {
 					return false;
 				}
-
 			}
 		};
 	}
 
-	CompatibilityPredicate is3_1() {
+	CompatibilityPredicate is3_3() {
 		return new CompatibilityPredicate() {
 
 			@Override
 			public String toString() {
-				return "Predicate for Boot 3.1";
+				return "Predicate for Boot 3.3";
 			}
 
 			@Override
 			public boolean isCompatible() {
 				try {
-					// since 3.1
-					ValidationConfigurationCustomizer.class.getMethod("setIgnoreRegistrationFailure", boolean.class);
+					Class.forName("org.springframework.boot.autoconfigure.ldap.PropertiesLdapConnectionDetails");
 					return true;
-
 				}
-				catch (NoSuchMethodException e) {
+				catch (ClassNotFoundException e) {
 					return false;
 				}
-
 			}
 		};
 	}

spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java

@@ -180,14 +180,14 @@ public void should_match_against_current_manifest() {
 			verifyCurrentVersionFromManifest("3.2.x");
 		}
 		catch (AssertionError 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;
-			// }
+			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;
+			}
 		}
 	}