From 455691108ea8ab7d34c741228e5794771aa6f71c Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Thu, 7 Feb 2019 14:38:20 +0100
Subject: [PATCH] Changed the order of formatting and checkstyle

---
 pom.xml | 52 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58199687..c8149ee2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,40 @@ limitations under the License.
 						<useDefaultDelimiters>false</useDefaultDelimiters>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>io.spring.javaformat</groupId>
+					<artifactId>spring-javaformat-maven-plugin</artifactId>
+					<version>${spring-javaformat.version}</version>
+					<executions>
+						<execution>
+							<phase>validate</phase>
+							<configuration>
+								<skip>${disable.checks}</skip>
+							</configuration>
+							<goals>
+								<goal>apply</goal>
+								<goal>validate</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>io.spring.javaformat</groupId>
+					<artifactId>spring-javaformat-maven-plugin</artifactId>
+					<version>${spring-javaformat.version}</version>
+					<executions>
+						<execution>
+							<phase>validate</phase>
+							<configuration>
+								<skip>${disable.checks}</skip>
+							</configuration>
+							<goals>
+								<goal>apply</goal>
+								<goal>validate</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
@@ -336,6 +370,7 @@ limitations under the License.
 							<phase>validate</phase>
 							<inherited>true</inherited>
 							<configuration>
+								<skip>${disable.checks}</skip>
 								<configLocation>checkstyle.xml</configLocation>
 								<headerLocation>checkstyle-header.txt</headerLocation>
 								<propertyExpansion>checkstyle.build.directory=${project.build.directory}
@@ -353,23 +388,6 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<groupId>io.spring.javaformat</groupId>
-					<artifactId>spring-javaformat-maven-plugin</artifactId>
-					<version>${spring-javaformat.version}</version>
-					<executions>
-						<execution>
-							<phase>validate</phase>
-							<configuration>
-								<skip>${disable.checks}</skip>
-							</configuration>
-							<goals>
-								<goal>apply</goal>
-								<goal>validate</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
 				<plugin>
 					<groupId>pl.project13.maven</groupId>
 					<artifactId>git-commit-id-plugin</artifactId>