Skip to content

Commit

Permalink
MCHECKSTYLE-384 Bump checkstyle to 8.28
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
hazendaz authored and eolivelli committed Feb 6, 2020
1 parent f0b96ab commit e1e2f28
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ under the License.
<!-- Because Checkstyle 7+ requires Java 8 -->
<javaVersion>8</javaVersion>
<mavenVersion>3.0</mavenVersion>
<checkstyleVersion>8.19</checkstyleVersion>
<checkstyleVersion>8.28</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
<sitePluginVersion>3.7.1</sitePluginVersion>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MCHECKSTYLE-129/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyleVersion}</version>
<configuration>
<configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-8.19/src/main/resources/sun_checks.xml</configLocation>
<configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-8.28/src/main/resources/sun_checks.xml</configLocation>
</configuration>
</plugin>
</plugins>
Expand Down
13 changes: 6 additions & 7 deletions src/it/MCHECKSTYLE-357/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@
<property name="charset" value="UTF-8" />
<property name="severity" value="error" />

<!-- Sizes -->
<module name="LineLength">
<property name="max" value="120" />
</module>

<module name="TreeWalker">
<property name="tabWidth" value="3" />

Expand All @@ -55,9 +60,7 @@

<!-- Annotations -->
<module name="AnnotationUseStyle" />
<module name="MissingDeprecated">
<property name="skipNoJavadoc" value="true" />
</module>
<module name="MissingDeprecated" />
<module name="MissingOverride" />
<module name="PackageAnnotation" />

Expand Down Expand Up @@ -134,10 +137,6 @@
<!-- Naming -->
<module name="ConstantName" />

<!-- Sizes -->
<module name="LineLength">
<property name="max" value="120" />
</module>
</module>

<module name="RegexpSingleline">
Expand Down
4 changes: 2 additions & 2 deletions src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
*/
def buildLog = new File( basedir, 'build.log' )

// 3 errors in src/additional/java and 2 errors in src/test-additional/java
assert buildLog.text.contains( "[INFO] There are 5 errors reported by Checkstyle" )
// 2 errors in src/additional/java and 1 errors in src/test-additional/java
assert buildLog.text.contains( "[INFO] There are 3 errors reported by Checkstyle" )
12 changes: 6 additions & 6 deletions src/it/multi-modules-aggregate/maven_checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ under the License.
<property name="message" value="Line has trailing spaces."/>
</module>-->

<module name="LineLength">
<property name="max" value="120" />
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
</module>

<module name="TreeWalker">

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

<module name="LineLength">
<property name="max" value="120" />
<property name="ignorePattern" value="@version|@see|@todo|TODO"/>
</module>

<module name="MemberName" />

<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<module name="MissingJavadocMethod">
<property name="severity" value="warning"/>
<property name="scope" value="protected"/>
</module>
Expand Down

0 comments on commit e1e2f28

Please sign in to comment.