diff --git a/build.gradle b/build.gradle
index 92d2ae4142..720d0c74c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,17 @@
 plugins {
 	id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276
+	id "io.spring.nohttp" version "0.0.3.RELEASE"
 }
 
 description = "Spring Boot Build"
 
 defaultTasks 'build'
 
+nohttp {
+	whitelistFile = project.file("src/nohttp/whitelist.lines")
+	source.exclude "buildSrc/build/**"
+}
+
 allprojects {
 	group "org.springframework.boot"
 
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
index 201ed3ec41..b43ee67099 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -164,8 +164,6 @@ class JavaConventions {
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
 		checkstyleDependencies
 				.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
-		checkstyleDependencies
-				.add(project.getDependencies().create("io.spring.nohttp:nohttp-checkstyle:0.0.3.RELEASE"));
 	}
 
 	void copyLegalFiles(Project project, CopySpec metaInf) {
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
index 2a447dd5e5..098ebf59e8 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java
@@ -90,7 +90,7 @@ class MavenPublishingConventions {
 	private void customizeLicences(MavenPomLicenseSpec licences) {
 		licences.license((licence) -> {
 			licence.getName().set("Apache License, Version 2.0");
-			licence.getUrl().set("http://www.apache.org/licenses/LICENSE-2.0");
+			licence.getUrl().set("https://www.apache.org/licenses/LICENSE-2.0");
 		});
 	}
 
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
index 9a7c8e0cde..559dd6235e 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/maven/resources/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/src/checkstyle/nohttp-checkstyle.xml b/src/checkstyle/nohttp-checkstyle.xml
deleted file mode 100644
index 3865174ebf..0000000000
--- a/src/checkstyle/nohttp-checkstyle.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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}/src/checkstyle/nohttp-whitelist.txt"/>
-	</module>
-</module>
diff --git a/src/nohttp/checkstyle.xml b/src/nohttp/checkstyle.xml
new file mode 100644
index 0000000000..be81bdb8ee
--- /dev/null
+++ b/src/nohttp/checkstyle.xml
@@ -0,0 +1,13 @@
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+	<property name="charset" value="UTF-8"/>
+	<property name="fileExtensions" value=""/>
+	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+		<property name="whitelistFileName" value="src/nohttp/whitelist.lines"/>
+	</module>
+	<module name="SuppressionFilter">
+		<property name="file" value="src/nohttp/suppressions.xml"/>
+	</module>
+	<module name="SuppressWithPlainTextCommentFilter"/>
+</module>
diff --git a/src/checkstyle/nohttp-checkstyle-suppressions.xml b/src/nohttp/suppressions.xml
similarity index 83%
rename from src/checkstyle/nohttp-checkstyle-suppressions.xml
rename to src/nohttp/suppressions.xml
index e9e5c6e528..69575ea3f5 100644
--- a/src/checkstyle/nohttp-checkstyle-suppressions.xml
+++ b/src/nohttp/suppressions.xml
@@ -4,10 +4,8 @@
 	"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|svg)" 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" />
 	<suppress files="[\\/]spring-boot-project.setup" checks="NoHttp" />
diff --git a/src/checkstyle/nohttp-whitelist.txt b/src/nohttp/whitelist.lines
similarity index 100%
rename from src/checkstyle/nohttp-whitelist.txt
rename to src/nohttp/whitelist.lines