[commons-validator] branch master updated: Update to more recent checkstyle syntax

[se...@apache.org]

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

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git


The following commit(s) were added to refs/heads/master by this push:
     new 14e1eda  Update to more recent checkstyle syntax
14e1eda is described below

commit 14e1edad94545703e8c71fb53cebc17a784ba844
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jun 22 20:41:24 2020 +0100

    Update to more recent checkstyle syntax
---
 checkstyle.xml | 28 ++++++++++++----------------
 pom.xml        |  2 --
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index fc8b64f..a776bf0 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -43,8 +43,6 @@
 
    <module name="TreeWalker">
 
-    <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
     <!-- Item 4 - Avoid creating duplicate objects -->
     <module name="IllegalInstantiation">
       <property name="classes" value="java.lang.Boolean, java.lang.String"/>
@@ -131,10 +129,18 @@
 
     <module name="MagicNumber"/>
 
-    <!-- This is needed for Suppression Comment Filters -->
-    <module name="FileContentsHolder"/>
+    <module name="SuppressionCommentFilter"/>
 
-  </module>
+    <!-- 
+      Allow comment to suppress checkstyle for a single line
+      e.g. // CHECKSTYLE IGNORE MagicNumber
+     -->
+    <module name="SuppressWithNearbyCommentFilter">
+      <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
+
+</module>
 
   <!-- enforce package documentation -->
   <module name="JavadocPackage">
@@ -154,20 +160,10 @@
     <property name="fileExtensions" value="java,xml"/>
   </module>
 
-  <module name="SuppressionCommentFilter"/>
-
   <module name="SuppressionFilter">
     <!-- config_loc is used by Eclipse plugin -->
     <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
   </module>
 
-  <!-- 
-      Allow comment to suppress checkstyle for a single line
-      e.g. // CHECKSTYLE IGNORE MagicNumber
-   -->
-  <module name="SuppressWithNearbyCommentFilter">
-    <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/>
-    <property name="checkFormat" value="$1"/>
-  </module>
-
+  
 </module>
diff --git a/pom.xml b/pom.xml
index b6d78fd..802a643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,6 @@
     <maven.compiler.target>1.7</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <!-- TODO: update checkstyle syntax to allow use of version defined in CP 51 -->
-    <commons.checkstyle-plugin.version>2.17</commons.checkstyle-plugin.version>
   </properties> 
 
   <scm>