Browse Source

Correct external application properties load order

Fixes gh-24308
pull/24326/head
Madhura Bhave 5 years ago
parent
commit
932fb65107
  1. 2
      spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
  2. 2
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java

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

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

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

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

Loading…
Cancel
Save