Merge branch '1.5.x'

2018-01-04 10:11:32 +01:00
parent bee5fa7fc6 d49b022ce3
commit e3bfd797a3
12 changed files with 2612 additions and 20 deletions
--- a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -22,4 +22,5 @@
 	<suppress files="Ansi.*\.java" checks="JavadocStyle" />
 	<suppress files="LogLevel\.java" checks="JavadocVariable" />
 	<suppress files="HelpMojo\.java" checks=".*"/>
+	<suppress files="[\\/]org.springframework.boot.configurationprocessor.json[\\/].*\.java$" checks=".*"/>
 </suppressions>