From 00a10bcf616c960f2d4f9fde5337ed9e004162ed Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 12 Oct 2016 10:37:15 +0200
Subject: [PATCH] Restore checkstyle

Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
---
 spring-boot-docs/pom.xml                                      | 1 -
 spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index f5c35946f2..f16317f0f4 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -17,7 +17,6 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
-		<disable.checks>true</disable.checks>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index b3a6758023..0e6ca91c65 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -13,6 +13,7 @@
 	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" />
 	<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocType" />
 	<suppress files="[\\/]autoconfigure[\\/]" checks="JavadocVariable" />
+	<suppress files="[\\/]spring-boot-docs[\\/]" checks="JavadocType" />
 	<suppress files="[\\/]spring-boot-samples[\\/]" checks="JavadocType" />
 	<suppress files="[\\/]spring-boot-deployment-tests[\\/]" checks="JavadocType" />
 	<suppress files="[\\/]spring-boot-integration-tests[\\/]" checks="JavadocType" />