This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch MCHECKSTYLE-384
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit e2951fc37fbefce84d45cef61a94638f2a19f75b
Author: Jeremy Landis <jeremylan...@hotmail.com>
AuthorDate: Sun Jan 19 22:55:04 2020 -0500
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 https://github.com/checkstyle/checkstyle/issues/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
---
src/it/MCHECKSTYLE-129/pom.xml | 2 +-
src/it/MCHECKSTYLE-357/pom.xml | 13 ++++++-------
src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy | 4 ++--
src/it/multi-modules-aggregate/maven_checks.xml | 12 ++++++------
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/it/MCHECKSTYLE-129/pom.xml b/src/it/MCHECKSTYLE-129/pom.xml
index 87f7926..33079a3 100644
--- a/src/it/MCHECKSTYLE-129/pom.xml
+++ b/src/it/MCHECKSTYLE-129/pom.xml
@@ -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>
diff --git a/src/it/MCHECKSTYLE-357/pom.xml b/src/it/MCHECKSTYLE-357/pom.xml
index 784307b..dfbdb97 100644
--- a/src/it/MCHECKSTYLE-357/pom.xml
+++ b/src/it/MCHECKSTYLE-357/pom.xml
@@ -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" />
@@ -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" />
@@ -134,10 +137,6 @@
<!-- Naming -->
<module name="ConstantName" />
- <!-- Sizes -->
- <module name="LineLength">
- <property name="max" value="120" />
- </module>
</module>
<module name="RegexpSingleline">
diff --git a/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
b/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
index e94b226..5e5890f 100644
--- a/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
+++ b/src/it/MCHECKSTYLE-70-multi-sourcefolder/verify.groovy
@@ -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" )
diff --git a/src/it/multi-modules-aggregate/maven_checks.xml
b/src/it/multi-modules-aggregate/maven_checks.xml
index 1fb5e94..4860a66 100644
--- a/src/it/multi-modules-aggregate/maven_checks.xml
+++ b/src/it/multi-modules-aggregate/maven_checks.xml
@@ -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"/>
@@ -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>
