From 8b57f1995bea54ff317194b13b7eeae3e5aea773 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 8 Jul 2019 12:19:19 -0400 Subject: [PATCH] Changing default properties name to work around changes in boot, see Spring Boot #17141 --- .../cloud/bootstrap/BootstrapApplicationListener.java | 2 +- .../cloud/bootstrap/config/BootstrapConfigurationTests.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java index 951fd6f7..2f65cf7a 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java @@ -84,7 +84,7 @@ public class BootstrapApplicationListener /** * The name of the default properties. */ - public static final String DEFAULT_PROPERTIES = "defaultProperties"; + public static final String DEFAULT_PROPERTIES = "springCloudDefaultProperties"; private int order = DEFAULT_ORDER; diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index ef742e1b..8cec3546 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.junit.After; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -371,7 +370,6 @@ public class BootstrapConfigurationTests { } @Test - @Ignore // FIXME 2.2.0.M1 public void includeProfileFromBootstrapProperties() { this.context = new SpringApplicationBuilder().web(WebApplicationType.NONE) .sources(BareConfiguration.class)