You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/06/05 17:29:52 UTC

[maven-shared-resources] branch master updated (7ca9b72 -> 4a75cc8)

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

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-resources.git.


    from 7ca9b72  README improvement
     new 4179d4d  [MSHARED-854] Adjust configuration to new Checkstyle 8.19+
     new 4a75cc8  Update DTD location

The 2 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:
 src/main/resources/config/maven_checks.xml | 34 ++++++++++++++----------------
 1 file changed, 16 insertions(+), 18 deletions(-)


[maven-shared-resources] 01/02: [MSHARED-854] Adjust configuration to new Checkstyle 8.19+

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-resources.git

commit 4179d4d5220c66ab6396512f0d6dbed069f06477
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 5 17:39:36 2020 +0200

    [MSHARED-854] Adjust configuration to new Checkstyle 8.19+
    
    Change required for maven-checkstyle-plugin 3.1.1 to validate our projects
    Remove cacheFile property from TreeWalker
---
 src/main/resources/config/maven_checks.xml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/config/maven_checks.xml b/src/main/resources/config/maven_checks.xml
index fda20c4..5d22e13 100644
--- a/src/main/resources/config/maven_checks.xml
+++ b/src/main/resources/config/maven_checks.xml
@@ -58,9 +58,20 @@ under the License.
         <property name="message" value="Line has trailing spaces."/>
     </module>-->
 
-    <module name="TreeWalker">
+    <module name="LineLength">
+        <property name="max" value="120" />
+        <property name="ignorePattern" value="@version|@see|@todo|TODO"/>
+    </module>
+
+    <!-- Support CHECKSTYLE_OFF: regexp and CHECKSTYLE_ON: regexp comments to disable/enable some checks -->
+    <!-- see http://checkstyle.sourceforge.net/config.html#SuppressionCommentFilter -->
+    <module name="SuppressWithPlainTextCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE_OFF\: (.+)"/>
+        <property name="onCommentFormat" value="CHECKSTYLE_ON\: (.+)"/>
+        <property name="checkFormat" value="$1"/>
+    </module>
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+    <module name="TreeWalker">
 
         <property name="tabWidth" value="4"/>
 
@@ -70,7 +81,7 @@ under the License.
 
         <!-- required for SuppressionCommentFilter -->
         <!-- see http://checkstyle.sourceforge.net/config.html#SuppressionCommentFilter -->
-        <module name="FileContentsHolder"/>
+        <!-- <module name="FileContentsHolder"/>   -->
 
         <module name="LeftCurly">
           <property name="option" value="nl"/>
@@ -80,11 +91,6 @@ 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.                     -->
@@ -210,12 +216,4 @@ under the License.
     <!-- See http://checkstyle.sourceforge.net/config_misc.html#UniqueProperties -->
     <module name="UniqueProperties"/>
 
-    <!-- Support CHECKSTYLE_OFF: regexp and CHECKSTYLE_ON: regexp comments to disable/enable some checks -->
-    <!-- see http://checkstyle.sourceforge.net/config.html#SuppressionCommentFilter -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE_OFF\: (.+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE_ON\: (.+)"/>
-        <property name="checkFormat" value="$1"/>
-    </module>
-
 </module>


[maven-shared-resources] 02/02: Update DTD location

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-resources.git

commit 4a75cc8d1d92d1ce4eb82435ffd10c900c6cf7f3
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Jun 5 19:09:21 2020 +0200

    Update DTD location
---
 src/main/resources/config/maven_checks.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/config/maven_checks.xml b/src/main/resources/config/maven_checks.xml
index 5d22e13..f04a0c8 100644
--- a/src/main/resources/config/maven_checks.xml
+++ b/src/main/resources/config/maven_checks.xml
@@ -19,8 +19,8 @@ under the License.
 -->
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
   Checkstyle configuration that checks the Maven coding conventions from: