Commit 5a723662 authored by Phillip Webb's avatar Phillip Webb

Do not use property placeholder in config names

Update ConfigFileApplicationContextInitializer so that the names
property defaults to `${spring.config.name},application`. This allows
application.properties files to be loaded even when property placeholder
expansion is not enabled.

Issue: #54462910
parent 448e3283
...@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements ...@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements
private String[] searchLocations = new String[] { "classpath:", "file:./", private String[] searchLocations = new String[] { "classpath:", "file:./",
"classpath:config/", "file:./config/" }; "classpath:config/", "file:./config/" };
private String names = "${spring.config.name:application}"; private String names = "${spring.config.name},application";
private int order = Integer.MIN_VALUE + 10; private int order = Integer.MIN_VALUE + 10;
......
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