Skip to content

Commit e1e2f28

Browse files
hazendazeolivelli
authored andcommitted
MCHECKSTYLE-384 Bump checkstyle to 8.28
[MCHECKSTYLE-384] [it] Match checkstyle version from 8.19 to 8.28 for direct checkstyle.xml file test [MCHECKSTYLE-384] [it] Remove 'skipNoJavadoc' as it was removed from checkstyle 8.24 see checkstyle/checkstyle#4983 [MCHECKSTYLE-384] [it] Move 'LineLength' from treewalker to checker module per checkstyle 8.24 [MCHECKSTYLE-384] [it] Change errors reported as javadoc checks changed in checkstyle 8.20 [MCHECKSTYLE-384] [it] Per checkstyle 8.21, Missing java doc split out and needs addressed here so current test remains intact
1 parent f0b96ab commit e1e2f28

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ under the License.
6666
<!-- Because Checkstyle 7+ requires Java 8 -->
6767
<javaVersion>8</javaVersion>
6868
<mavenVersion>3.0</mavenVersion>
69-
<checkstyleVersion>8.19</checkstyleVersion>
69+
<checkstyleVersion>8.28</checkstyleVersion>
7070
<doxiaVersion>1.4</doxiaVersion>
7171
<sitePluginVersion>3.7.1</sitePluginVersion>
7272
</properties>

src/it/MCHECKSTYLE-129/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ under the License.
5757
<artifactId>maven-checkstyle-plugin</artifactId>
5858
<version>${checkstyleVersion}</version>
5959
<configuration>
60-
<configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-8.19/src/main/resources/sun_checks.xml</configLocation>
60+
<configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-8.28/src/main/resources/sun_checks.xml</configLocation>
6161
</configuration>
6262
</plugin>
6363
</plugins>

src/it/MCHECKSTYLE-357/pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
<property name="charset" value="UTF-8" />
4545
<property name="severity" value="error" />
4646

47+
<!-- Sizes -->
48+
<module name="LineLength">
49+
<property name="max" value="120" />
50+
</module>
51+
4752
<module name="TreeWalker">
4853
<property name="tabWidth" value="3" />
4954

@@ -55,9 +60,7 @@
5560

5661
<!-- Annotations -->
5762
<module name="AnnotationUseStyle" />
58-
<module name="MissingDeprecated">
59-
<property name="skipNoJavadoc" value="true" />
60-
</module>
63+
<module name="MissingDeprecated" />
6164
<module name="MissingOverride" />
6265
<module name="PackageAnnotation" />
6366

@@ -134,10 +137,6 @@
134137
<!-- Naming -->
135138
<module name="ConstantName" />
136139

137-
<!-- Sizes -->
138-
<module name="LineLength">
139-
<property name="max" value="120" />
140-
</module>
141140
</module>
142141

143142
<module name="RegexpSingleline">

src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
*/
2020
def buildLog = new File( basedir, 'build.log' )
2121

22-
// 3 errors in src/additional/java and 2 errors in src/test-additional/java
23-
assert buildLog.text.contains( "[INFO] There are 5 errors reported by Checkstyle" )
22+
// 2 errors in src/additional/java and 1 errors in src/test-additional/java
23+
assert buildLog.text.contains( "[INFO] There are 3 errors reported by Checkstyle" )

src/it/multi-modules-aggregate/maven_checks.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ under the License.
5757
<property name="message" value="Line has trailing spaces."/>
5858
</module>-->
5959

60+
<module name="LineLength">
61+
<property name="max" value="120" />
62+
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
63+
</module>
64+
6065
<module name="TreeWalker">
6166

6267
<property name="tabWidth" value="4"/>
@@ -73,16 +78,11 @@ under the License.
7378
<property name="option" value="alone"/>
7479
</module>
7580

76-
<module name="LineLength">
77-
<property name="max" value="120" />
78-
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
79-
</module>
80-
8181
<module name="MemberName" />
8282

8383
<!-- Checks for Javadoc comments. -->
8484
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
85-
<module name="JavadocMethod">
85+
<module name="MissingJavadocMethod">
8686
<property name="severity" value="warning"/>
8787
<property name="scope" value="protected"/>
8888
</module>

0 commit comments

Comments
 (0)