From b7b830b8e27080d274ecf7f5dac27e164261b652 Mon Sep 17 00:00:00 2001
From: Spring Operator <spring-operator@users.noreply.github.com>
Date: Tue, 19 Mar 2019 22:41:17 -0500
Subject: [PATCH] URL Cleanup

This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* http://www.puppycrawl.com/dtds/configuration_1_2.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/configuration_1_2.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_2.dtd) result 404).
* http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* http://maven.apache.org/xsd/maven-4.0.0.xsd with 3 occurrences migrated to:
  https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200).

# Ignored
These URLs were intentionally ignored.

* http://maven.apache.org/POM/4.0.0 with 6 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 3 occurrences

* Use the latest Checkstyle DTDs with their HTTPS variants
---
 build.gradle                               |   2 +-
 samples/sample-01/pom.xml                  |   2 +-
 samples/sample-02/pom.xml                  |   2 +-
 samples/sample-03/pom.xml                  |   2 +-
 src/checkstyle/checkstyle-suppressions.xml |  14 +-
 src/checkstyle/checkstyle.xml              | 162 +++++++++++----------
 6 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/build.gradle b/build.gradle
index 523b2db2..2a94b879 100644
--- a/build.gradle
+++ b/build.gradle
@@ -133,7 +133,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.17"
+		toolVersion = "8.18"
 	}
 
 	jacocoTestReport {
diff --git a/samples/sample-01/pom.xml b/samples/sample-01/pom.xml
index 2cfc2fea..90953b89 100644
--- a/samples/sample-01/pom.xml
+++ b/samples/sample-01/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>com.example</groupId>
diff --git a/samples/sample-02/pom.xml b/samples/sample-02/pom.xml
index 33ae9658..4ae2b989 100644
--- a/samples/sample-02/pom.xml
+++ b/samples/sample-02/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>com.example</groupId>
diff --git a/samples/sample-03/pom.xml b/samples/sample-03/pom.xml
index 1963648d..d8b949b9 100644
--- a/samples/sample-03/pom.xml
+++ b/samples/sample-03/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>com.example</groupId>
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 1c707c3b..3cdb29a5 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files="package-info\.java" checks=".*" />
-	<suppress files="[\\/]test[\\/]" checks="RequireThis" />
-	<suppress files="[\\/]test[\\/]" checks="Javadoc*" />
-	<suppress files="KafkaMatchersTests" checks="RegexpSinglelineJava" />
-	<suppress files="DeserializationException" checks="MutableException" />
+	<suppress files="package-info\.java" checks=".*"/>
+	<suppress files="[\\/]test[\\/]" checks="RequireThis"/>
+	<suppress files="[\\/]test[\\/]" checks="Javadoc*"/>
+	<suppress files="KafkaMatchersTests" checks="RegexpSinglelineJava"/>
+	<suppress files="DeserializationException" checks="MutableException"/>
 </suppressions>
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index f369d49d..8dc3fa11 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<!DOCTYPE module PUBLIC
+		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+		"https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
 	<module name="SuppressionFilter">
-		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml" />
+		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
 	</module>
 
 	<!-- Root Checks -->
 	<module name="RegexpHeader">
-		<property name="headerFile" value="src/checkstyle/checkstyle-header.txt" />
-		<property name="fileExtensions" value="java" />
+		<property name="headerFile" value="src/checkstyle/checkstyle-header.txt"/>
+		<property name="fileExtensions" value="java"/>
 	</module>
 	<module name="NewlineAtEndOfFile">
 		<property name="lineSeparator" value="lf"/>
@@ -20,63 +22,63 @@
 
 		<!-- Annotations -->
 		<module name="AnnotationUseStyle">
-			<property name="elementStyle" value="compact" />
+			<property name="elementStyle" value="compact"/>
 		</module>
-		<module name="MissingOverride" />
-		<module name="PackageAnnotation" />
+		<module name="MissingOverride"/>
+		<module name="PackageAnnotation"/>
 		<module name="AnnotationLocation">
 			<property name="allowSamelineSingleParameterlessAnnotation"
-				value="false" />
+					  value="false"/>
 		</module>
 
 		<!-- Block Checks -->
 		<module name="EmptyBlock">
-			<property name="option" value="text" />
+			<property name="option" value="text"/>
 		</module>
-		<module name="LeftCurly" />
+		<module name="LeftCurly"/>
 		<module name="RightCurly">
-			<property name="option" value="alone" />
+			<property name="option" value="alone"/>
 		</module>
-		<module name="NeedBraces" />
-		<module name="AvoidNestedBlocks" />
+		<module name="NeedBraces"/>
+		<module name="AvoidNestedBlocks"/>
 
 		<!-- Class Design -->
-		<module name="FinalClass" />
-		<module name="InterfaceIsType" />
-		<module name="HideUtilityClassConstructor" />
-		<module name="MutableException" />
-		<module name="InnerTypeLast" />
-		<module name="OneTopLevelClass" />
+		<module name="FinalClass"/>
+		<module name="InterfaceIsType"/>
+		<module name="HideUtilityClassConstructor"/>
+		<module name="MutableException"/>
+		<module name="InnerTypeLast"/>
+		<module name="OneTopLevelClass"/>
 
 		<!-- Coding -->
-		<module name="CovariantEquals" />
-		<module name="EmptyStatement" />
-		<module name="EqualsHashCode" />
-		<module name="InnerAssignment" />
-		<module name="SimplifyBooleanExpression" />
-		<module name="SimplifyBooleanReturn" />
-		<module name="StringLiteralEquality" />
+		<module name="CovariantEquals"/>
+		<module name="EmptyStatement"/>
+		<module name="EqualsHashCode"/>
+		<module name="InnerAssignment"/>
+		<module name="SimplifyBooleanExpression"/>
+		<module name="SimplifyBooleanReturn"/>
+		<module name="StringLiteralEquality"/>
 		<module name="NestedForDepth">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
 		<module name="NestedIfDepth">
-			<property name="max" value="4" />
+			<property name="max" value="4"/>
 		</module>
 		<module name="NestedTryDepth">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
-		<module name="MultipleVariableDeclarations" />
+		<module name="MultipleVariableDeclarations"/>
 		<module name="RequireThis">
-			<property name="validateOnlyOverlapping" value="false" />
-			<property name="checkMethods" value="false" />
+			<property name="validateOnlyOverlapping" value="false"/>
+			<property name="checkMethods" value="false"/>
 		</module>
-		<module name="OneStatementPerLine" />
+		<module name="OneStatementPerLine"/>
 
 		<!-- Imports -->
-		<module name="AvoidStarImport" />
+		<module name="AvoidStarImport"/>
 		<module name="AvoidStaticImport">
 			<property name="excludes"
-				value="org.assertj.core.api.Assertions.*,
+					  value="org.assertj.core.api.Assertions.*,
 				org.junit.jupiter.api.Assertions.*,
 				org.junit.Assert.*,
 				org.junit.Assume.*,
@@ -87,19 +89,19 @@
 				org.mockito.BDDMockito.*,
 				org.mockito.ArgumentMatchers.*,
 				org.springframework.kafka.test.hamcrest.KafkaMatchers.*,
-				org.springframework.kafka.test.assertj.KafkaConditions.*" />
+				org.springframework.kafka.test.assertj.KafkaConditions.*"/>
 		</module>
-		<module name="IllegalImport" />
-		<module name="RedundantImport" />
+		<module name="IllegalImport"/>
+		<module name="RedundantImport"/>
 		<module name="UnusedImports">
-			<property name="processJavadoc" value="true" />
+			<property name="processJavadoc" value="true"/>
 		</module>
 		<module name="ImportOrder">
-			<property name="groups" value="java,/^javax?\./,org,org.springframework,*" />
-			<property name="ordered" value="true" />
-			<property name="separated" value="true" />
-			<property name="option" value="top" />
-			<property name="sortStaticImportsAlphabetically" value="true" />
+			<property name="groups" value="java,/^javax?\./,org,org.springframework,*"/>
+			<property name="ordered" value="true"/>
+			<property name="separated" value="true"/>
+			<property name="option" value="top"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
 		</module>
 
 		<!-- Javadoc Comments -->
@@ -108,7 +110,7 @@
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
 		<module name="JavadocMethod">
-			<property name="allowMissingJavadoc" value="true" />
+			<property name="allowMissingJavadoc" value="true"/>
 		</module>
 		<module name="JavadocVariable">
 			<property name="scope" value="public"/>
@@ -116,73 +118,73 @@
 		<module name="JavadocStyle">
 			<property name="checkEmptyJavadoc" value="true"/>
 		</module>
-		<module name="NonEmptyAtclauseDescription" />
+		<module name="NonEmptyAtclauseDescription"/>
 		<module name="JavadocTagContinuationIndentation">
 			<property name="offset" value="0"/>
 		</module>
 		<module name="AtclauseOrder">
 			<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
-		<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
+			<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
 		</module>
 		<module name="AtclauseOrder">
 			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-		<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
+			<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
 		</module>
 
 		<!-- Miscellaneous -->
 		<module name="CommentsIndentation">
-			<property name="tokens" value="BLOCK_COMMENT_BEGIN" />
+			<property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
 		</module>
-		<module name="UpperEll" />
-		<module name="ArrayTypeStyle" />
-		<module name="OuterTypeFilename" />
+		<module name="UpperEll"/>
+		<module name="ArrayTypeStyle"/>
+		<module name="OuterTypeFilename"/>
 
 		<!-- Modifiers -->
-		<module name="RedundantModifier" />
+		<module name="RedundantModifier"/>
 
 		<!-- Regexp -->
 		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* +\t*\S" />
+			<property name="format" value="^\t* +\t*\S"/>
 			<property name="message"
-				value="Line has leading space characters; indentation should be performed with tabs only." />
-			<property name="ignoreComments" value="true" />
+					  value="Line has leading space characters; indentation should be performed with tabs only."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
- 		<module name="RegexpSinglelineJava">
- 			<property name="maximum" value="0"/>
- 			<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)" />
- 			<property name="message"
- 				value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)." />
- 			<property name="ignoreComments" value="true" />
- 		</module>
 		<module name="RegexpSinglelineJava">
 			<property name="maximum" value="0"/>
-			<property name="format" value="org\.junit\.Assert\.assert" />
+			<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)"/>
 			<property name="message"
-				value="Please use AssertJ imports." />
-			<property name="ignoreComments" value="true" />
+					  value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+		<module name="RegexpSinglelineJava">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.junit\.Assert\.assert"/>
+			<property name="message"
+					  value="Please use AssertJ imports."/>
+			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="Regexp">
-			<property name="format" value="[ \t]+$" />
-			<property name="illegalPattern" value="true" />
-			<property name="message" value="Trailing whitespace" />
+			<property name="format" value="[ \t]+$"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Trailing whitespace"/>
 		</module>
 		<module name="Regexp">
-			<property name="format" value="System.(out|err).print" />
-			<property name="illegalPattern" value="true" />
-			<property name="message" value="System.out or .err" />
+			<property name="format" value="System.(out|err).print"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="System.out or .err"/>
 		</module>
 
 		<!-- Whitespace -->
-		<module name="GenericWhitespace" />
-		<module name="MethodParamPad" />
-		<module name="NoWhitespaceAfter" >
+		<module name="GenericWhitespace"/>
+		<module name="MethodParamPad"/>
+		<module name="NoWhitespaceAfter">
 			<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
 		</module>
-		<module name="NoWhitespaceBefore" />
-		<module name="ParenPad" />
-		<module name="TypecastParenPad" />
-		<module name="WhitespaceAfter" />
-		<module name="WhitespaceAround" />
+		<module name="NoWhitespaceBefore"/>
+		<module name="ParenPad"/>
+		<module name="TypecastParenPad"/>
+		<module name="WhitespaceAfter"/>
+		<module name="WhitespaceAround"/>
 
 	</module>
 </module>