Merge branch '2.3.x' into 2.4.x

Closes gh-26653
2021-05-25 10:37:40 +02:00 · 2021-05-25 10:37:40 +02:00 · 9ff372c915
parent 4955c80da5 b5ebf836e3
commit 9ff372c915
1 changed files with 6 additions and 0 deletions
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@ -848,6 +848,12 @@
      "sourceType": "org.springframework.boot.context.config.ConfigFileApplicationListener",
      "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",
      "type": "java.util.List<java.lang.String>",