Merge branch '2.4.x'

Closes gh-26654
spring-projects · May 25, 2021 · d5b41e2 · d5b41e2
2 parents 44ad121 + 9ff372c
commit d5b41e2
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
@@ -911,6 +911,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>",