Skip to content

S
spring-boot
Commit d5b41e28 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.4.x' 

Closes gh-26654
parents 44ad121c 9ff372c9
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @ d5b41e28
...@@ -911,6 +911,12 @@ ...@@ -911,6 +911,12 @@
"sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener", "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
"description": "Comma-separated list of active profiles. Can be overridden by a command line switch." "description": "Comma-separated list of active profiles. Can be overridden by a command line switch."
}, },
{
"name": "spring.profiles.default",
"type": "java.lang.String",
"description": "Name of the profile to enable if no profile is active.",
"defaultValue": "default"
},
{ {
"name": "spring.profiles.include", "name": "spring.profiles.include",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.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