SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changing default properties name to work around changes in boot, see Spring Boot #17141

Browse Source
This commit is contained in:
Ryan Baxter
2019-07-08 12:19:19 -04:00
parent 2ec67abda1
commit 8b57f1995b
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java
View File

@@ -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;

2
spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java
View File

@@ -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)