From b14b53f98e8355fd14cbec579cdd2d7c29489558 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 1 Oct 2018 10:30:37 +0200
Subject: [PATCH] Going back to old checkstyle rules

---
 pom.xml | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0644131..734e5b69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,31 +300,21 @@ limitations under the License.
 					<version>${checkstyle.version}</version>
 					<dependencies>
 						<dependency>
-							<groupId>com.puppycrawl.tools</groupId>
-							<artifactId>checkstyle</artifactId>
-							<version>${puppycrawl-tools-checkstyle.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>org.springframework.boot</groupId>
-							<artifactId>spring-boot-build</artifactId>
-							<version>${spring-boot.version}</version>
-						</dependency>
-						<dependency>
-							<groupId>io.spring.javaformat</groupId>
-							<artifactId>spring-javaformat-checkstyle</artifactId>
-							<version>${spring-javaformat.version}</version>
+							<groupId>org.springframework.cloud</groupId>
+							<artifactId>spring-cloud-build-tools</artifactId>
+							<version>${spring-cloud-build.version}</version>
 						</dependency>
 					</dependencies>
+					<configuration>
+						<configLocation>checkstyle.xml</configLocation>
+						<headerLocation>LICENSE.txt</headerLocation>
+						<consoleOutput>true</consoleOutput>
+						<failsOnError>true</failsOnError>
+					</configuration>
 					<executions>
 						<execution>
-							<id>checkstyle-validation</id>
+							<id>validate</id>
 							<phase>validate</phase>
-							<configuration>
-								<skip>${disable.checks}</skip>
-								<configLocation>src/checkstyle/checkstyle.xml</configLocation>
-								<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-								<includeTestSourceDirectory>true</includeTestSourceDirectory>
-							</configuration>
 							<goals>
 								<goal>check</goal>
 							</goals>