From f7360b05adc987ae2aaf9796d2216b147f199277 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 7 Sep 2020 08:59:54 +0100 Subject: [PATCH] Compatibility check if Spring Boot version is unknown It is better not to fail the compatibility check if the Spring Boot version is unknown. --- .../cloud/configuration/SpringBootVersionVerifier.java | 7 +++++-- .../cloud/configuration/SpringBootDependencyTests.java | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) 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 cc9d0140..c295c7b6 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 @@ -87,8 +87,11 @@ class SpringBootVersionVerifier implements CompatibilityVerifier { if (log.isDebugEnabled()) { log.debug("Version found in Boot manifest [" + version + "]"); } - return StringUtils.hasText(version) - && version.startsWith(stripWildCardFromVersion(s)); + if (!StringUtils.hasText(version)) { + log.info("Cannot check Boot version"); + return true; + } + return version.startsWith(stripWildCardFromVersion(s)); } String getVersionFromManifest() { 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 880886d2..341b24e8 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 @@ -132,7 +132,7 @@ public class SpringBootDependencyTests { acceptedVersions) { @Override String getVersionFromManifest() { - return ""; + return "2.1"; } }; versionVerifier.ACCEPTED_VERSIONS.clear(); @@ -207,7 +207,7 @@ public class SpringBootDependencyTests { acceptedVersions) { @Override String getVersionFromManifest() { - return ""; + return "2.0"; } }; versionVerifier.ACCEPTED_VERSIONS.remove("2.1");