Skip to content

Commit b7b830b

Browse files
spring-operatorartembilan
spring-operator
authored and
artembilan
committed
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
1 parent 15750b9 commit b7b830b

File tree

6 files changed

+94
-92
lines changed

6 files changed

+94
-92
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ subprojects { subproject ->
133133

134134
checkstyle {
135135
configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
136-
toolVersion = "8.17"
136+
toolVersion = "8.18"
137137
}
138138

139139
jacocoTestReport {

‎samples/sample-01/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.example</groupId>

‎samples/sample-02/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.example</groupId>

‎samples/sample-03/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.example</groupId>

‎src/checkstyle/checkstyle-suppressions.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE suppressions PUBLIC
3-
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
4-
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
3+
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
4+
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
55
<suppressions>
6-
<suppress files="package-info\.java" checks=".*" />
7-
<suppress files="[\\/]test[\\/]" checks="RequireThis" />
8-
<suppress files="[\\/]test[\\/]" checks="Javadoc*" />
9-
<suppress files="KafkaMatchersTests" checks="RegexpSinglelineJava" />
10-
<suppress files="DeserializationException" checks="MutableException" />
6+
<suppress files="package-info\.java" checks=".*"/>
7+
<suppress files="[\\/]test[\\/]" checks="RequireThis"/>
8+
<suppress files="[\\/]test[\\/]" checks="Javadoc*"/>
9+
<suppress files="KafkaMatchersTests" checks="RegexpSinglelineJava"/>
10+
<suppress files="DeserializationException" checks="MutableException"/>
1111
</suppressions>

‎src/checkstyle/checkstyle.xml

+83-81
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0"?>
2-
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
2+
<!DOCTYPE module PUBLIC
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
35
<module name="Checker">
46

57
<module name="SuppressionFilter">
6-
<property name="file" value="src/checkstyle/checkstyle-suppressions.xml" />
8+
<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
79
</module>
810

911
<!-- Root Checks -->
1012
<module name="RegexpHeader">
11-
<property name="headerFile" value="src/checkstyle/checkstyle-header.txt" />
12-
<property name="fileExtensions" value="java" />
13+
<property name="headerFile" value="src/checkstyle/checkstyle-header.txt"/>
14+
<property name="fileExtensions" value="java"/>
1315
</module>
1416
<module name="NewlineAtEndOfFile">
1517
<property name="lineSeparator" value="lf"/>
@@ -20,63 +22,63 @@
2022

2123
<!-- Annotations -->
2224
<module name="AnnotationUseStyle">
23-
<property name="elementStyle" value="compact" />
25+
<property name="elementStyle" value="compact"/>
2426
</module>
25-
<module name="MissingOverride" />
26-
<module name="PackageAnnotation" />
27+
<module name="MissingOverride"/>
28+
<module name="PackageAnnotation"/>
2729
<module name="AnnotationLocation">
2830
<property name="allowSamelineSingleParameterlessAnnotation"
29-
value="false" />
31+
value="false"/>
3032
</module>
3133

3234
<!-- Block Checks -->
3335
<module name="EmptyBlock">
34-
<property name="option" value="text" />
36+
<property name="option" value="text"/>
3537
</module>
36-
<module name="LeftCurly" />
38+
<module name="LeftCurly"/>
3739
<module name="RightCurly">
38-
<property name="option" value="alone" />
40+
<property name="option" value="alone"/>
3941
</module>
40-
<module name="NeedBraces" />
41-
<module name="AvoidNestedBlocks" />
42+
<module name="NeedBraces"/>
43+
<module name="AvoidNestedBlocks"/>
4244

4345
<!-- Class Design -->
44-
<module name="FinalClass" />
45-
<module name="InterfaceIsType" />
46-
<module name="HideUtilityClassConstructor" />
47-
<module name="MutableException" />
48-
<module name="InnerTypeLast" />
49-
<module name="OneTopLevelClass" />
46+
<module name="FinalClass"/>
47+
<module name="InterfaceIsType"/>
48+
<module name="HideUtilityClassConstructor"/>
49+
<module name="MutableException"/>
50+
<module name="InnerTypeLast"/>
51+
<module name="OneTopLevelClass"/>
5052

5153
<!-- Coding -->
52-
<module name="CovariantEquals" />
53-
<module name="EmptyStatement" />
54-
<module name="EqualsHashCode" />
55-
<module name="InnerAssignment" />
56-
<module name="SimplifyBooleanExpression" />
57-
<module name="SimplifyBooleanReturn" />
58-
<module name="StringLiteralEquality" />
54+
<module name="CovariantEquals"/>
55+
<module name="EmptyStatement"/>
56+
<module name="EqualsHashCode"/>
57+
<module name="InnerAssignment"/>
58+
<module name="SimplifyBooleanExpression"/>
59+
<module name="SimplifyBooleanReturn"/>
60+
<module name="StringLiteralEquality"/>
5961
<module name="NestedForDepth">
60-
<property name="max" value="3" />
62+
<property name="max" value="3"/>
6163
</module>
6264
<module name="NestedIfDepth">
63-
<property name="max" value="4" />
65+
<property name="max" value="4"/>
6466
</module>
6567
<module name="NestedTryDepth">
66-
<property name="max" value="3" />
68+
<property name="max" value="3"/>
6769
</module>
68-
<module name="MultipleVariableDeclarations" />
70+
<module name="MultipleVariableDeclarations"/>
6971
<module name="RequireThis">
70-
<property name="validateOnlyOverlapping" value="false" />
71-
<property name="checkMethods" value="false" />
72+
<property name="validateOnlyOverlapping" value="false"/>
73+
<property name="checkMethods" value="false"/>
7274
</module>
73-
<module name="OneStatementPerLine" />
75+
<module name="OneStatementPerLine"/>
7476

7577
<!-- Imports -->
76-
<module name="AvoidStarImport" />
78+
<module name="AvoidStarImport"/>
7779
<module name="AvoidStaticImport">
7880
<property name="excludes"
79-
value="org.assertj.core.api.Assertions.*,
81+
value="org.assertj.core.api.Assertions.*,
8082
org.junit.jupiter.api.Assertions.*,
8183
org.junit.Assert.*,
8284
org.junit.Assume.*,
@@ -87,19 +89,19 @@
8789
org.mockito.BDDMockito.*,
8890
org.mockito.ArgumentMatchers.*,
8991
org.springframework.kafka.test.hamcrest.KafkaMatchers.*,
90-
org.springframework.kafka.test.assertj.KafkaConditions.*" />
92+
org.springframework.kafka.test.assertj.KafkaConditions.*"/>
9193
</module>
92-
<module name="IllegalImport" />
93-
<module name="RedundantImport" />
94+
<module name="IllegalImport"/>
95+
<module name="RedundantImport"/>
9496
<module name="UnusedImports">
95-
<property name="processJavadoc" value="true" />
97+
<property name="processJavadoc" value="true"/>
9698
</module>
9799
<module name="ImportOrder">
98-
<property name="groups" value="java,/^javax?\./,org,org.springframework,*" />
99-
<property name="ordered" value="true" />
100-
<property name="separated" value="true" />
101-
<property name="option" value="top" />
102-
<property name="sortStaticImportsAlphabetically" value="true" />
100+
<property name="groups" value="java,/^javax?\./,org,org.springframework,*"/>
101+
<property name="ordered" value="true"/>
102+
<property name="separated" value="true"/>
103+
<property name="option" value="top"/>
104+
<property name="sortStaticImportsAlphabetically" value="true"/>
103105
</module>
104106

105107
<!-- Javadoc Comments -->
@@ -108,81 +110,81 @@
108110
<property name="authorFormat" value=".+\s.+"/>
109111
</module>
110112
<module name="JavadocMethod">
111-
<property name="allowMissingJavadoc" value="true" />
113+
<property name="allowMissingJavadoc" value="true"/>
112114
</module>
113115
<module name="JavadocVariable">
114116
<property name="scope" value="public"/>
115117
</module>
116118
<module name="JavadocStyle">
117119
<property name="checkEmptyJavadoc" value="true"/>
118120
</module>
119-
<module name="NonEmptyAtclauseDescription" />
121+
<module name="NonEmptyAtclauseDescription"/>
120122
<module name="JavadocTagContinuationIndentation">
121123
<property name="offset" value="0"/>
122124
</module>
123125
<module name="AtclauseOrder">
124126
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
125-
<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
127+
<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
126128
</module>
127129
<module name="AtclauseOrder">
128130
<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
129-
<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
131+
<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
130132
</module>
131133

132134
<!-- Miscellaneous -->
133135
<module name="CommentsIndentation">
134-
<property name="tokens" value="BLOCK_COMMENT_BEGIN" />
136+
<property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
135137
</module>
136-
<module name="UpperEll" />
137-
<module name="ArrayTypeStyle" />
138-
<module name="OuterTypeFilename" />
138+
<module name="UpperEll"/>
139+
<module name="ArrayTypeStyle"/>
140+
<module name="OuterTypeFilename"/>
139141

140142
<!-- Modifiers -->
141-
<module name="RedundantModifier" />
143+
<module name="RedundantModifier"/>
142144

143145
<!-- Regexp -->
144146
<module name="RegexpSinglelineJava">
145-
<property name="format" value="^\t* +\t*\S" />
147+
<property name="format" value="^\t* +\t*\S"/>
146148
<property name="message"
147-
value="Line has leading space characters; indentation should be performed with tabs only." />
148-
<property name="ignoreComments" value="true" />
149-
</module>
150-
<module name="RegexpSinglelineJava">
151-
<property name="maximum" value="0"/>
152-
<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)" />
153-
<property name="message"
154-
value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)." />
155-
<property name="ignoreComments" value="true" />
156-
</module>
149+
value="Line has leading space characters; indentation should be performed with tabs only."/>
150+
<property name="ignoreComments" value="true"/>
151+
</module>
152+
<module name="RegexpSinglelineJava">
153+
<property name="maximum" value="0"/>
154+
<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)"/>
155+
<property name="message"
156+
value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)."/>
157+
<property name="ignoreComments" value="true"/>
158+
</module>
157159
<module name="RegexpSinglelineJava">
158160
<property name="maximum" value="0"/>
159-
<property name="format" value="org\.junit\.Assert\.assert" />
161+
<property name="format" value="org\.junit\.Assert\.assert"/>
160162
<property name="message"
161-
value="Please use AssertJ imports." />
162-
<property name="ignoreComments" value="true" />
163+
value="Please use AssertJ imports."/>
164+
<property name="ignoreComments" value="true"/>
163165
</module>
164166
<module name="Regexp">
165-
<property name="format" value="[ \t]+$" />
166-
<property name="illegalPattern" value="true" />
167-
<property name="message" value="Trailing whitespace" />
167+
<property name="format" value="[ \t]+$"/>
168+
<property name="illegalPattern" value="true"/>
169+
<property name="message" value="Trailing whitespace"/>
168170
</module>
169171
<module name="Regexp">
170-
<property name="format" value="System.(out|err).print" />
171-
<property name="illegalPattern" value="true" />
172-
<property name="message" value="System.out or .err" />
172+
<property name="format" value="System.(out|err).print"/>
173+
<property name="illegalPattern" value="true"/>
174+
<property name="message" value="System.out or .err"/>
173175
</module>
174176

175177
<!-- Whitespace -->
176-
<module name="GenericWhitespace" />
177-
<module name="MethodParamPad" />
178-
<module name="NoWhitespaceAfter" >
178+
<module name="GenericWhitespace"/>
179+
<module name="MethodParamPad"/>
180+
<module name="NoWhitespaceAfter">
179181
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
180182
</module>
181-
<module name="NoWhitespaceBefore" />
182-
<module name="ParenPad" />
183-
<module name="TypecastParenPad" />
184-
<module name="WhitespaceAfter" />
185-
<module name="WhitespaceAround" />
183+
<module name="NoWhitespaceBefore"/>
184+
<module name="ParenPad"/>
185+
<module name="TypecastParenPad"/>
186+
<module name="WhitespaceAfter"/>
187+
<module name="WhitespaceAround"/>
186188

187189
</module>
188190
</module>

0 commit comments

Comments
 (0)