From be09a2c2a328417dc19b14b734740057e398966f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Tue, 18 Jun 2019 11:02:44 +0200
Subject: [PATCH] DATAGRAPH-1236 - Integrate nohttp tooling into CI build
 profile.

---
 checkstyle/config.xml                         |  2 ++
 checkstyle/suppressions.xml                   |  2 +-
 pom.xml                                       | 24 ++++++++++++-------
 .../ExtendedTransactionsTests.java            |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/checkstyle/config.xml b/checkstyle/config.xml
index 2b99e29fb..85a1cdc65 100644
--- a/checkstyle/config.xml
+++ b/checkstyle/config.xml
@@ -18,4 +18,6 @@
     <module name="NewlineAtEndOfFile"/>
 
     <module name="SuppressWarningsFilter" />
+
+    <module name="io.spring.nohttp.checkstyle.check.NoHttpCheck" />
 </module>
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 3875722d5..59845ab3b 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress checks="RegexpHeader" files="package-info\.java"/>
 </suppressions>
diff --git a/pom.xml b/pom.xml
index 90f3092bf..24b7d4b15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 		<project.type>multi</project.type>
 
 		<checkstyle.version>8.18</checkstyle.version>
+		<nohttp.version>0.0.3.RELEASE</nohttp.version>
 		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
 		<neo4j.ogm.version>3.1.11</neo4j.ogm.version>
 		<springdata.commons>2.1.10.BUILD-SNAPSHOT</springdata.commons>
@@ -281,22 +282,27 @@
 							<artifactId>checkstyle</artifactId>
 							<version>${checkstyle.version}</version>
 						</dependency>
+						<dependency>
+							<groupId>io.spring.nohttp</groupId>
+							<artifactId>nohttp-checkstyle</artifactId>
+							<version>${nohttp.version}</version>
+						</dependency>
 					</dependencies>
-					<configuration>
-						<configLocation>checkstyle/config.xml</configLocation>
-						<suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
-						<headerLocation>checkstyle/java-header.txt</headerLocation>
-						<encoding>${project.build.sourceEncoding}</encoding>
-						<consoleOutput>true</consoleOutput>
-						<failsOnError>true</failsOnError>
-						<includeTestSourceDirectory>true</includeTestSourceDirectory>
-					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
 				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration combine.self="override">
+					<configLocation>checkstyle/config.xml</configLocation>
+					<suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation>
+					<headerLocation>checkstyle/java-header.txt</headerLocation>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<consoleOutput>true</consoleOutput>
+					<failsOnError>true</failsOnError>
+					<includeTestSourceDirectory>true</includeTestSourceDirectory>
+				</configuration>
 				<executions>
 					<execution>
 						<id>validate</id>
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
index 330e3a4b7..0277134ad 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transactions/ExtendedTransactionsTests.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author: Vince Bickers
- * @see http://stackoverflow.com/questions/17224887/java-spring-transactional-method-not-rolling-back-as-expected
+ * @see https://stackoverflow.com/questions/17224887/java-spring-transactional-method-not-rolling-back-as-expected
  * @see DATAGRAPH-602
  */
 @ContextConfiguration(classes = { ExtendedTransactionsTests.ApplicationConfig.class })