Merge branch '1.2.x'

10 years ago · a69cd36dbc
parent 3df6cb1325 d4ffab2f02
commit a69cd36dbc
1 changed files with 5 additions and 0 deletions
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@ -64,6 +64,11 @@
  	"type": "java.lang.String",
  	"description": "Preferred JSON mapper to use for HTTP message conversion."
  },
  {
  	"name": "spring.http.gzip.enabled",
  	"type": "java.lang.Boolean",
  	"description": "Enable gzip filter support."
  },
  {
    "name": "spring.jmx.enabled",
    "type": "java.lang.Boolean",