You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2020/02/06 10:32:19 UTC

[maven-checkstyle-plugin] branch MCHECKSTYLE-384 updated (e2951fc -> e1e2f28)

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a change to branch MCHECKSTYLE-384
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.


 discard e2951fc  MCHECKSTYLE-384 Bump checkstyle to 8.28
    omit fbb8d4b  [MCHECKSTYLE-384] [pom] Bump checkstyle to 8.28
     add f0b96ab  [MCHECKSTYLE-388] Upgrade dependencies
     new e1e2f28  MCHECKSTYLE-384 Bump checkstyle to 8.28

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e2951fc)
            \
             N -- N -- N   refs/heads/MCHECKSTYLE-384 (e1e2f28)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


[maven-checkstyle-plugin] 01/01: MCHECKSTYLE-384 Bump checkstyle to 8.28

Posted by eo...@apache.org.
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 e1e2f28620e2baed8351fea5fa524e98749df55c
Author: Jeremy Landis <je...@hotmail.com>
AuthorDate: Sun Jan 19 22:11:32 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
---
 pom.xml                                                |  2 +-
 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 ++++++------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index c90764c..9453610 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
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>