From dc3a4674c44011e7b421b8ab25b04c2a22eae19d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 19:20:48 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 2.2.5.RELEASE --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c66cce0b..76f8e62c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 5cf70e02..ff7bda8a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index eee79288..ffca7e26 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-commons-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 0a8fc317..c0e47e31 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index be6c9673..cde8e85e 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 82225877..db1a11d6 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 2651cbd8..b15199ea 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index c8dd74e3..b5f9b325 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index c68614f7..b5ceb858 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 1e57136f..70ba0275 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 74f1af7c..33f238d5 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-test-support From 0cdd6e5aa7ee7d7f30035f92cde6c0c53b665f66 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 19:25:12 +0000 Subject: [PATCH 2/5] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 76f8e62c..c66cce0b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index ff7bda8a..5cf70e02 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index ffca7e26..eee79288 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index c0e47e31..0a8fc317 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index cde8e85e..be6c9673 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index db1a11d6..82225877 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index b15199ea..2651cbd8 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index b5f9b325..c8dd74e3 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index b5ceb858..c68614f7 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 70ba0275..1e57136f 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 33f238d5..74f1af7c 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-test-support From ec264fb23e199b6cdb78327b15f28595fabdf584 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 19:25:12 +0000 Subject: [PATCH 3/5] Bumping versions to 2.2.6.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-commons-dependencies/pom.xml | 2 +- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context-integration-tests/pom.xml | 2 +- spring-cloud-context-webflux-integration-tests/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-loadbalancer/pom.xml | 2 +- spring-cloud-starter-loadbalancer/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- spring-cloud-test-support/pom.xml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index c66cce0b..87ca8b01 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 5cf70e02..8157c8d0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index eee79288..cd598f2d 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-commons-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 0a8fc317..6199e0fd 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml index be6c9673..02dc96b1 100644 --- a/spring-cloud-context-integration-tests/pom.xml +++ b/spring-cloud-context-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-context-integration-tests diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml index 82225877..03826cbc 100644 --- a/spring-cloud-context-webflux-integration-tests/pom.xml +++ b/spring-cloud-context-webflux-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-context-webflux-integration-tests diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 2651cbd8..4e9f77bf 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml index c8dd74e3..752b83e3 100644 --- a/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-loadbalancer/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-loadbalancer diff --git a/spring-cloud-starter-loadbalancer/pom.xml b/spring-cloud-starter-loadbalancer/pom.xml index c68614f7..f0240b57 100644 --- a/spring-cloud-starter-loadbalancer/pom.xml +++ b/spring-cloud-starter-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. 4.0.0 diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 1e57136f..c0eba85b 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml index 74f1af7c..f6b51fe8 100644 --- a/spring-cloud-test-support/pom.xml +++ b/spring-cloud-test-support/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-commons-parent - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-test-support From 5f92501a0dc0171510e891560d21dbb0dea5c594 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 15 Sep 2020 14:13:17 -0400 Subject: [PATCH 4/5] Performance improvements to NamedContextFactory. (#826) Fixes gh-825 --- .../context/named/NamedContextFactory.java | 14 ++++---- .../named/NamedContextFactoryTests.java | 36 +++++++++++++++++++ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java index 7ac1384b..54ae7d64 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java @@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.context.ApplicationContext; @@ -143,10 +144,12 @@ public abstract class NamedContextFactory T getInstance(String name, Class type) { AnnotationConfigApplicationContext context = getContext(name); - if (BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, - type).length > 0) { + try { return context.getBean(type); } + catch (NoSuchBeanDefinitionException e) { + // ignore + } return null; } @@ -181,11 +184,8 @@ public abstract class NamedContextFactory Map getInstances(String name, Class type) { AnnotationConfigApplicationContext context = getContext(name); - if (BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, - type).length > 0) { - return BeanFactoryUtils.beansOfTypeIncludingAncestors(context, type); - } - return null; + + return BeanFactoryUtils.beansOfTypeIncludingAncestors(context, type); } /** diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java index 2424683b..b5d3720b 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java @@ -54,6 +54,18 @@ public class NamedContextFactoryTests { Bar foobar = factory.getInstance("foo", Bar.class); then(foobar).as("bar was not null").isNull(); + Baz fooBaz = factory.getInstance("foo", Baz.class); + then(fooBaz).as("fooBaz was null").isNotNull(); + + Object fooContainerFoo = factory.getInstance("foo", Container.class, Foo.class); + then(fooContainerFoo).as("fooContainerFoo was null").isNotNull(); + + Object fooContainerBar = factory.getInstance("foo", Container.class, Bar.class); + then(fooContainerBar).as("fooContainerBar was not null").isNull(); + + Object barContainerBar = factory.getInstance("bar", Container.class, Bar.class); + then(barContainerBar).as("barContainerBar was null").isNotNull(); + Map fooBazes = factory.getInstances("foo", Baz.class); then(fooBazes).as("fooBazes was null").isNotNull(); then(fooBazes.size()).as("fooBazes size was wrong").isEqualTo(1); @@ -146,6 +158,11 @@ public class NamedContextFactoryTests { return new Foo(); } + @Bean + Container fooContainer() { + return new Container<>(new Foo()); + } + } static class Foo { @@ -164,10 +181,29 @@ public class NamedContextFactoryTests { return new Baz(); } + @Bean + Container barContainer() { + return new Container<>(new Bar()); + } + } static class Bar { } + static class Container { + + private final T item; + + Container(T item) { + this.item = item; + } + + public T getItem() { + return this.item; + } + + } + } From f7360b05adc987ae2aaf9796d2216b147f199277 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 7 Sep 2020 08:59:54 +0100 Subject: [PATCH 5/5] 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");