From 998266fba49073a66a9ff7866104f4731e8327a7 Mon Sep 17 00:00:00 2001
From: Tim Ysewyn <TYsewyn@users.noreply.github.com>
Date: Mon, 1 Oct 2018 23:28:47 +0200
Subject: [PATCH] Fixed checkstyle setup (#76)

---
 pom.xml                          | 6 ++++--
 spring-cloud-build-tools/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index faa44409..415e8ac4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,8 @@
 		<!-- Plugins -->
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-		<checkstyle.version>8.12</checkstyle.version>
+		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
+		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
 		<puppycrawl-tools-checkstyle.version>8.12</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.6</spring-javaformat.version>
 		<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
@@ -60,6 +61,7 @@
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.6</spring-javaformat-checkstyle.version>
 		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+		<disable.checks>false</disable.checks>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -304,7 +306,7 @@ limitations under the License.
 						<dependency>
 							<groupId>com.puppycrawl.tools</groupId>
 							<artifactId>checkstyle</artifactId>
-							<version>${checkstyle.version}</version>
+							<version>${puppycrawl-tools-checkstyle.version}</version>
 						</dependency>
 						<dependency>
 							<groupId>io.spring.javaformat</groupId>
diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml
index 3c6b7cc5..3c41191d 100644
--- a/spring-cloud-build-tools/pom.xml
+++ b/spring-cloud-build-tools/pom.xml
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>com.puppycrawl.tools</groupId>
 			<artifactId>checkstyle</artifactId>
-			<version>${checkstyle.version}</version>
+			<version>${puppycrawl-tools-checkstyle.version}</version>
 		</dependency>
 	</dependencies>