Merge branch '2.3.x' into 2.4.x

Closes gh-26653
spring-projects · May 25, 2021 · 9ff372c · 9ff372c
2 parents 4955c80 + b5ebf83
commit 9ff372c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...ect/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/...ect/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>",