root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Correct external application properties load order 

Fixes gh-24308
This commit is contained in:
Madhura Bhave 2020-12-03 11:55:51 -08:00
parent 6c6e339dbb
commit 932fb65107
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -638,8 +638,8 @@ For example, if `spring.config.additional-location` is configured with the value
. `optional:classpath:/` . `optional:classpath:/`
. `optional:classpath:/config/` . `optional:classpath:/config/`
. `optional:file:./` . `optional:file:./`
. `optional:file:./config/*/`
. `optional:file:./config/` . `optional:file:./config/`
. `optional:file:./config/*/`
. `optional:classpath:custom-config/` . `optional:classpath:custom-config/`
. `optional:file:./custom-config/` . `optional:file:./custom-config/`

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java
View File

@ -90,8 +90,8 @@ class ConfigDataEnvironment {
locations.add(ConfigDataLocation.of("optional:classpath:/")); locations.add(ConfigDataLocation.of("optional:classpath:/"));
locations.add(ConfigDataLocation.of("optional:classpath:/config/")); locations.add(ConfigDataLocation.of("optional:classpath:/config/"));
locations.add(ConfigDataLocation.of("optional:file:./")); locations.add(ConfigDataLocation.of("optional:file:./"));
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
locations.add(ConfigDataLocation.of("optional:file:./config/")); locations.add(ConfigDataLocation.of("optional:file:./config/"));
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
DEFAULT_SEARCH_LOCATIONS = locations.toArray(new ConfigDataLocation[0]); DEFAULT_SEARCH_LOCATIONS = locations.toArray(new ConfigDataLocation[0]);
}; };