From 476f232d499ddf4fd9960e41c5a45f7c847c558c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 13 Apr 2015 12:23:06 +0200 Subject: [PATCH] Fix "spring.mandatory-file-encoding" property doc --- .../src/main/asciidoc/appendix-application-properties.adoc | 2 +- .../META-INF/additional-spring-configuration-metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 8da94269b5a..1aa8632799a 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -456,7 +456,7 @@ content into your application; rather pick only the properties that you need. spring.aop.proxy-target-class= # FILE ENCODING ({sc-spring-boot}/context/FileEncodingApplicationListener.{sc-ext}[FileEncodingApplicationListener]) - spring.mandatory-file-encoding=false + spring.mandatory-file-encoding= # Expected character encoding the application must use # SPRING SOCIAL ({sc-spring-boot-autoconfigure}/social/SocialWebAutoConfiguration.{sc-ext}[SocialWebAutoConfiguration]) spring.social.auto-connection-views=true # Set to true for default connection views or false if you provide your own diff --git a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 3cf3e0275e9..548fb91f342 100644 --- a/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -50,7 +50,7 @@ { "name": "spring.mandatory-file-encoding", "sourceType": "org.springframework.boot.context.FileEncodingApplicationListener", - "type": "java.lang.String", + "type": "java.nio.charset.Charset", "description": "Expected character encoding the application must use." }, {