From 4bac6c6688809f7c7670058ea6202a71b1f73a39 Mon Sep 17 00:00:00 2001 From: Muhammad Hewedy Date: Tue, 5 Mar 2019 13:20:34 +0300 Subject: [PATCH] Order the search locations in javadoc by precedence order See gh-16099 --- .../boot/context/config/ConfigFileApplicationListener.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java index 1ba833ba2d..f186397761 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java @@ -72,12 +72,13 @@ import org.springframework.util.StringUtils; /** * {@link EnvironmentPostProcessor} that configures the context environment by loading * properties from well known file locations. By default properties will be loaded from - * 'application.properties' and/or 'application.yml' files in the following locations: + * 'application.properties' and/or 'application.yml' files in the following locations + * ordered by the search order: * *

* Alternative search locations and names can be specified using