Skip to content

Commit 932fb65

Browse files
committed
Correct external application properties load order
Fixes gh-24308
1 parent 6c6e339 commit 932fb65

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,8 @@ For example, if `spring.config.additional-location` is configured with the value
638638
. `optional:classpath:/`
639639
. `optional:classpath:/config/`
640640
. `optional:file:./`
641-
. `optional:file:./config/*/`
642641
. `optional:file:./config/`
642+
. `optional:file:./config/*/`
643643
. `optional:classpath:custom-config/`
644644
. `optional:file:./custom-config/`
645645

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class ConfigDataEnvironment {
9090
locations.add(ConfigDataLocation.of("optional:classpath:/"));
9191
locations.add(ConfigDataLocation.of("optional:classpath:/config/"));
9292
locations.add(ConfigDataLocation.of("optional:file:./"));
93-
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
9493
locations.add(ConfigDataLocation.of("optional:file:./config/"));
94+
locations.add(ConfigDataLocation.of("optional:file:./config/*/"));
9595
DEFAULT_SEARCH_LOCATIONS = locations.toArray(new ConfigDataLocation[0]);
9696
};
9797

0 commit comments

Comments
 (0)