From fb24b5a684a535ecf6a12d7df198fa034ca62e67 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 7 Jun 2019 11:31:20 -0700
Subject: [PATCH] Separate nottp checkstyle configuration

See gh-16682
---
 pom.xml                                       |  1 -
 spring-boot-parent/pom.xml                    | 34 +++++++++++++++++++
 .../checkstyle/checkstyle-suppressions.xml    |  4 ---
 .../src/checkstyle/checkstyle.xml             |  3 --
 .../nohttp-checkstyle-suppressions.xml        | 13 +++++++
 .../src/checkstyle/nohttp-checkstyle.xml      |  7 ++++
 .../src/checkstyle/nohttp-whitelist.txt       |  6 +++-
 spring-boot-samples/pom.xml                   | 12 +++++++
 8 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 spring-boot-parent/src/checkstyle/nohttp-checkstyle-suppressions.xml
 create mode 100644 spring-boot-parent/src/checkstyle/nohttp-checkstyle.xml

diff --git a/pom.xml b/pom.xml
index 83cb98c4de9..5cfc1946c9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
 					<artifactId>replacer</artifactId>
 					<version>1.5.3</version>
 				</plugin>
-
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index b77267aa9ed..98942ccfdae 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -539,6 +539,40 @@
 							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>nohttp-checkstyle-validation</id>
+						<phase>validate</phase>
+						<configuration>
+							<skip>${disable.checks}</skip>
+							<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
+							<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+							<sourceDirectories>./</sourceDirectories>
+							<includes>**/*</includes>
+							<excludes>.git/**/*,target/**/*</excludes>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>nohttp-checkstyle-validation</id>
+						<phase>validate</phase>
+						<configuration>
+							<skip>${disable.checks}</skip>
+							<configLocation>src/checkstyle/nohttp-checkstyle.xml</configLocation>
+							<suppressionsLocation>src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
 							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
 							<sourceDirectories>./</sourceDirectories>
 							<includes>**/*</includes>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index d9051e72e90..64f1fde5201 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -3,11 +3,7 @@
 	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files="[\\/]transaction-logs[\\/]" checks=".*" />
 	<suppress files="[\\/]target[\\/]" checks=".*" />
-	<suppress files="[\\/]build.log" checks=".*" />
-	<suppress files=".+\.(jar|git|ico|p12)" checks=".*" />
-	<suppress files="dependency-reduced-pom.xml" checks="NoHttp" />
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 9bc8ad31b55..7eba2cff9e0 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
-	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
-		<property name="whitelistFileName" value="${main.basedir}/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt"/>
-	</module>
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
diff --git a/spring-boot-parent/src/checkstyle/nohttp-checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/nohttp-checkstyle-suppressions.xml
new file mode 100644
index 00000000000..9c6ba7eeaf9
--- /dev/null
+++ b/spring-boot-parent/src/checkstyle/nohttp-checkstyle-suppressions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+	<suppress files="[\\/]transaction-logs[\\/]" checks="NoHttp" />
+	<suppress files="[\\/]target[\\/]" checks="NoHttp" />
+	<suppress files="[\\/]build.log" checks="NoHttp" />
+	<suppress files=".+\.(jar|git|ico|p12|gif|jks|jpg)" checks="NoHttp" />
+	<suppress files="dependency-reduced-pom.xml" checks="NoHttp" />
+	<suppress files="jquery.validate.js" checks="NoHttp" />
+	<suppress files="jquery-[0-9]\.[0-9]\.[0-9].js" checks="NoHttp" />
+</suppressions>
diff --git a/spring-boot-parent/src/checkstyle/nohttp-checkstyle.xml b/spring-boot-parent/src/checkstyle/nohttp-checkstyle.xml
new file mode 100644
index 00000000000..cd4f96f7ecd
--- /dev/null
+++ b/spring-boot-parent/src/checkstyle/nohttp-checkstyle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+		<property name="whitelistFileName" value="${main.basedir}/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt"/>
+	</module>
+</module>
diff --git a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
index 2c6f8a3b614..9cc1b36ff97 100644
--- a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
+++ b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
@@ -1,2 +1,6 @@
-^http://livereload.com/protocols/official-7.*
+^http://docs.groovy-lang.org.*
 ^http://exslt.org/common.*
+^http://groovy-lang.org.*
+^http://hsqldb.org.*
+^http://livereload.com/.*
+^http://www.jdotsoft.com.*
\ No newline at end of file
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 363da7bb30c..6863b0baecd 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -171,6 +171,18 @@
 							<configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+						</configuration>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>nohttp-checkstyle-validation</id>
+						<phase>validate</phase>
+						<configuration>
+							<skip>${disable.checks}</skip>
+							<configLocation>../spring-boot-parent/src/checkstyle/nohttp-checkstyle.xml</configLocation>
+							<suppressionsLocation>../spring-boot-parent/src/checkstyle/nohttp-checkstyle-suppressions.xml</suppressionsLocation>
 							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
 							<sourceDirectories>./</sourceDirectories>
 							<includes>**/*</includes>