Commit 24d478d0 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #16099 from mhewedy

* pr/16099:
  Polish "Order the search locations in javadoc by precedence order"
  Order the search locations in javadoc by precedence order
parents 28175c86 372802a2
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -74,11 +74,13 @@ import org.springframework.util.StringUtils; ...@@ -74,11 +74,13 @@ import org.springframework.util.StringUtils;
* properties from well known file locations. By default properties will be loaded from * 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:
* <ul> * <ul>
* <li>classpath:</li> * <li>file:./config/:</li>
* <li>file:./</li> * <li>file:./</li>
* <li>classpath:config/</li> * <li>classpath:config/</li>
* <li>file:./config/:</li> * <li>classpath:</li>
* </ul> * </ul>
* The list is ordered by precedence (properties defined in locations higher in the list
* override those defined in lower locations).
* <p> * <p>
* Alternative search locations and names can be specified using * Alternative search locations and names can be specified using
* {@link #setSearchLocations(String)} and {@link #setSearchNames(String)}. * {@link #setSearchLocations(String)} and {@link #setSearchNames(String)}.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment