Merge pull request #1717 from spencergibb/next-5.1.x

Updates version to 5.1.0-SNAPSHOT and adds boot 4.2 support

Author: ryanjbaxter

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

@@ -50,9 +50,4 @@ SpringBootVersionVerifier springBootVersionVerifier(CompatibilityVerifierPropert
 		return new SpringBootVersionVerifier(properties.getCompatibleBootVersions());
 	}
 
-	@Bean
-	SleuthPresentVerifier sleuthPresentVerifier() {
-		return new SleuthPresentVerifier();
-	}
-
 }

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

@@ -37,7 +37,7 @@ public class CompatibilityVerifierProperties {
 	 * the patch version if you don't want to specify a concrete value. Example:
 	 * {@code 3.5.x}
 	 */
-	private List<String> compatibleBootVersions = List.of("4.0.x", "4.1.x");
+	private List<String> compatibleBootVersions = List.of("4.2.x");
 
 	public boolean isEnabled() {
 		return this.enabled;

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

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.configuration;
 
-import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +24,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.boot.SpringBootVersion;
-import org.springframework.boot.info.ProcessInfo;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.util.StringUtils;
 
 /**
@@ -35,7 +34,7 @@ class SpringBootVersionVerifier implements CompatibilityVerifier {
 
 	private static final Log log = LogFactory.getLog(SpringBootVersionVerifier.class);
 
-	final Map<String, CompatibilityPredicate> ACCEPTED_VERSIONS = new HashMap<>(Map.of("4.0", is4_0(), "4.1", is4_1()));
+	final Map<String, CompatibilityPredicate> ACCEPTED_VERSIONS = new HashMap<>(Map.of("4.2", is4_2()));
 
 	private final List<String> acceptedVersions;
 
@@ -68,39 +67,18 @@ String getVersionFromManifest() {
 		return SpringBootVersion.getVersion();
 	}
 
-	CompatibilityPredicate is4_0() {
+	CompatibilityPredicate is4_2() {
 		return new CompatibilityPredicate() {
 
 			@Override
 			public String toString() {
-				return "Predicate for Boot 4.0";
+				return "Predicate for Boot 4.2";
 			}
 
 			@Override
 			public boolean isCompatible() {
 				try {
-					Class.forName("org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty");
-					return true;
-				}
-				catch (ClassNotFoundException e) {
-					return false;
-				}
-			}
-		};
-	}
-
-	CompatibilityPredicate is4_1() {
-		return new CompatibilityPredicate() {
-
-			@Override
-			public String toString() {
-				return "Predicate for Boot 4.1";
-			}
-
-			@Override
-			public boolean isCompatible() {
-				try {
-					ProcessInfo.class.getMethod("getUptime", Duration.class);
+					ApplicationHome.class.getMethod("getSourcePath");
 					return true;
 				}
 				catch (NoSuchMethodException e) {

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

@@ -176,20 +176,8 @@ String getVersionFromManifest() {
 
 	@Test
 	public void should_match_against_current_manifest() {
-		try {
-			verifyCurrentVersionFromManifest("4.0");
-			verifyCurrentVersionFromManifest("4.0.x");
-		}
-		catch (AssertionError e) {
-			if (e.getMessage() != null && e.getMessage().contains("4.1.")) {
-				// we're likely running a boot 4.1 compatibility test, try 4.1
-				verifyCurrentVersionFromManifest("4.1");
-				verifyCurrentVersionFromManifest("4.1.x");
-			}
-			else {
-				throw e;
-			}
-		}
+		verifyCurrentVersionFromManifest("4.2");
+		verifyCurrentVersionFromManifest("4.2.x");
 	}
 
 	private void verifyCurrentVersionFromManifest(String version) {
@@ -205,15 +193,15 @@ private void verifyCurrentVersionFromManifest(String version) {
 
 	@Test
 	public void should_match_against_current_predicate() {
-		List<String> acceptedVersions = Collections.singletonList("4.0");
+		List<String> acceptedVersions = Collections.singletonList("4.2");
 		SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) {
 			@Override
 			String getVersionFromManifest() {
 				return "";
 			}
 		};
 		versionVerifier.ACCEPTED_VERSIONS.clear();
-		versionVerifier.ACCEPTED_VERSIONS.put("4.0", versionVerifier.is4_0());
+		versionVerifier.ACCEPTED_VERSIONS.put("4.2", versionVerifier.is4_2());
 
 		VerificationResult verificationResult = versionVerifier.verify();
 
@@ -223,15 +211,15 @@ String getVersionFromManifest() {
 
 	@Test
 	public void should_match_against_current_predicate_with_version_ending_with_x() {
-		List<String> acceptedVersions = Collections.singletonList("4.0.x");
+		List<String> acceptedVersions = Collections.singletonList("4.2.x");
 		SpringBootVersionVerifier versionVerifier = new SpringBootVersionVerifier(acceptedVersions) {
 			@Override
 			String getVersionFromManifest() {
 				return "";
 			}
 		};
 		versionVerifier.ACCEPTED_VERSIONS.clear();
-		versionVerifier.ACCEPTED_VERSIONS.put("4.0", versionVerifier.is4_0());
+		versionVerifier.ACCEPTED_VERSIONS.put("4.2", versionVerifier.is4_2());
 
 		VerificationResult verificationResult = versionVerifier.verify();