From d67f6c9c3b07332f12939ca7e47b69c2e7081602 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Wed, 12 Aug 2020 11:48:37 +0200
Subject: [PATCH] DATAGRAPH-1328 - Align checkstyle config to override parent
 configuration with Neo4j checkstyle rules.

---
 Jenkinsfile |  2 --
 pom.xml     | 58 ++++++++++++++++++++---------------------------------
 2 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 575fc8d5f..dfc08017b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -105,7 +105,6 @@ pipeline {
 			steps {
 				sh 'mkdir -p /tmp/jenkins-home'
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
-						'-Drunning-on-ci ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -135,7 +134,6 @@ pipeline {
 
 			steps {
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute ' +
-						'-Drunning-on-ci ' +
 						'-Dartifactory.server=https://repo.spring.io ' +
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
diff --git a/pom.xml b/pom.xml
index 4e43134e6..aed30a98b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -522,6 +522,28 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>validate</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration combine.self="override">
+					<configLocation>${project.basedir}/etc/checkstyle/config.xml</configLocation>
+					<suppressionsLocation>${project.basedir}/etc/checkstyle/suppressions.xml</suppressionsLocation>
+					<headerLocation>${project.basedir}/etc/checkstyle/java-header.txt</headerLocation>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<consoleOutput>true</consoleOutput>
+					<failsOnError>true</failsOnError>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -742,40 +764,4 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<profiles>
-		<profile>
-			<id>always-but-ci</id>
-			<activation>
-				<property>
-					<name>!running-on-ci</name>
-				</property>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-checkstyle-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>validate</id>
-								<phase>validate</phase>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<configLocation>${project.basedir}/etc/checkstyle/config.xml</configLocation>
-							<suppressionsLocation>${project.basedir}/etc/checkstyle/suppressions.xml</suppressionsLocation>
-							<headerLocation>${project.basedir}/etc/checkstyle/java-header.txt</headerLocation>
-							<encoding>${project.build.sourceEncoding}</encoding>
-							<consoleOutput>true</consoleOutput>
-							<failsOnError>true</failsOnError>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>