root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' 

Closes gh-31902
This commit is contained in:
Phillip Webb 2022-07-28 10:44:57 +01:00
parent 7b2bacb272 5c52882f76
commit 49a8e81dc3
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/properties-and-configuration.adoc
View File

@ -148,9 +148,7 @@ You can also provide the following System properties (or environment variables)
No matter what you set in the environment, Spring Boot always loads `application.properties` as described above.
By default, if YAML is used, then files with the '`.yml`' extension are also added to the list.
Spring Boot logs the configuration files that are loaded at the `DEBUG` level and the candidates it has not found at `TRACE` level.
See {spring-boot-module-code}/context/config/ConfigFileApplicationListener.java[`ConfigFileApplicationListener`] for more detail.
TIP: If you want detailed information about the files that are being loaded you can <<features#features.logging.log-levels, set the logging level>> of `org.springframework.boot.context.config` to `trace`.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
View File

@ -97,7 +97,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor implements EnvironmentPost
private final Log logger;
// Before ConfigFileApplicationListener so values there can use these
// Before ConfigDataEnvironmentPostProcessor so values there can use these
private int order = ConfigDataEnvironmentPostProcessor.ORDER - 1;
/**

11
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -308,7 +308,7 @@
{
"name": "spring.config.additional-location",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"sourceType": "org.springframework.boot.context.config.ConfigDataEnvironment",
"description": "Config file locations used in addition to the defaults."
},
{
@ -320,13 +320,13 @@
{
"name": "spring.config.location",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"sourceType": "org.springframework.boot.context.config.ConfigDataEnvironment",
"description": "Config file locations that replace the defaults."
},
{
"name": "spring.config.name",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"sourceType": "org.springframework.boot.context.config.StandardConfigDataLocationResolver",
"description": "Config file name.",
"defaultValue": "application"
},
@ -919,7 +919,7 @@
{
"name": "spring.profiles",
"type": "java.util.List<java.lang.String>",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"sourceType": "org.springframework.boot.context.config.Profiles",
"description": "Comma-separated list of profile expressions that at least one should match for the document to be included.",
"deprecation": {
"replacement": "spring.config.activate.on-profile",
@ -929,12 +929,13 @@
{
"name": "spring.profiles.active",
"type": "java.util.List<java.lang.String>",
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"sourceType": "org.springframework.boot.context.config.Profiles",
"description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
},
{
"name": "spring.profiles.default",
"type": "java.lang.String",
"sourceType": "org.springframework.boot.context.config.Profiles",
"description": "Name of the profile to enable if no profile is active.",
"defaultValue": "default"
},