From 932fb65107a8935af86895a79c91c27c54f4e10c Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 3 Dec 2020 11:55:51 -0800 Subject: [PATCH] Correct external application properties load order Fixes gh-24308 --- .../src/docs/asciidoc/spring-boot-features.adoc | 2 +- .../boot/context/config/ConfigDataEnvironment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 6b80d2d750ae..ee58a3aae494 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/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 . `optional:classpath:/` . `optional:classpath:/config/` . `optional:file:./` -. `optional:file:./config/*/` . `optional:file:./config/` +. `optional:file:./config/*/` . `optional:classpath:custom-config/` . `optional:file:./custom-config/` diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java index 9095d9f24b73..674ad2457df7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigDataEnvironment.java @@ -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]); };