Merge branch '2.1.x' into 2.2.x

See gh-19150
2019-11-27 09:56:41 +00:00 · 2019-11-27 09:56:41 +00:00 · f2bd27f4a3
parent abe070051e f117dbe8a1
commit f2bd27f4a3
1 changed files with 7 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
@ -665,6 +665,13 @@
      "description": "Whether initialization should be performed lazily.",
      "defaultValue": false
    },
+    {
+      "name": "spring.main.log-startup-info",
+      "type": "java.lang.Boolean",
+      "sourceType": "org.springframework.boot.SpringApplication",
+      "description": "Whether to log information about the application when it starts.",
+      "defaultValue": true
+    },
    {
      "name": "spring.main.register-shutdown-hook",
      "type": "java.lang.Boolean",