From 22f44917ca79d71878d0cd448110e719cf092298 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 15 Oct 2019 08:41:07 +0200 Subject: [PATCH] Polish "Add metadata entry for spring.main.register-shutdown-hook" See gh-18581 --- .../asciidoc/appendix-application-properties.adoc | 2 +- .../additional-spring-configuration-metadata.json | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 3f91d1ef084..01c652d20c6 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -120,9 +120,9 @@ Rather, pick only the properties that you need. # APPLICATION SETTINGS ({spring-boot-module-code}/SpringApplication.java[SpringApplication]) spring.main.allow-bean-definition-overriding=false # Whether bean definition overriding, by registering a definition with the same name as an existing definition, is allowed. spring.main.banner-mode=console # Mode used to display the banner when the application runs. + spring.main.register-shutdown-hook=true # Whether the application should have a shutdown hook registered. spring.main.sources= # Sources (class names, package names, or XML resource locations) to include in the ApplicationContext. spring.main.web-application-type= # Flag to explicitly request a specific type of web application. If not set, auto-detected based on the classpath. - spring.main.register-shutdown-hook=true # Whether shutdown hooks are automatically registered when Spring Boot start. If not set, they are automatically registered. # FILE ENCODING ({spring-boot-module-code}/context/FileEncodingApplicationListener.java[FileEncodingApplicationListener]) spring.mandatory-file-encoding= # Expected character encoding the application must use. diff --git 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 index fd47a2efaff..7cf9d7b40fc 100644 --- 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 @@ -607,6 +607,13 @@ "description": "Mode used to display the banner when the application runs.", "defaultValue": "console" }, + { + "name": "spring.main.register-shutdown-hook", + "type": "java.lang.Boolean", + "sourceType": "org.springframework.boot.SpringApplication", + "description": "Whether the application should have a shutdown hook registered.", + "defaultValue": true + }, { "name": "spring.main.show-banner", "type": "java.lang.Boolean", @@ -629,13 +636,6 @@ "sourceType": "org.springframework.boot.SpringApplication", "description": "Flag to explicitly request a specific type of web application. If not set, auto-detected based on the classpath." }, - { - "name": "spring.main.register-shutdown-hook", - "type": "java.lang.Boolean", - "sourceType": "org.springframework.boot.SpringApplication", - "description": "Whether shutdown hooks are automatically registered when Spring Boot start. If not set, they are automatically registered.", - "defaultValue": true - }, { "name": "spring.main.web-environment", "type": "java.lang.Boolean",