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

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


The following commit(s) were added to refs/heads/master by this push:
     new d83153e  Bump maven-checkstyle-plugin from 2.15 to 3.1.1 #41.
d83153e is described below

commit d83153e81bfbcf3107653d941ed7dab4071a8fc6
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Dec 28 10:58:37 2020 -0500

    Bump maven-checkstyle-plugin from 2.15 to 3.1.1 #41.
---
 pom.xml                 |  4 ++--
 src/changes/changes.xml |  5 ++++-
 src/conf/checkstyle.xml | 18 ++++++------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00fe404..c2e4fc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,7 +233,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.15</version>
+          <version>${commons.checkstyle-plugin.version}</version>
           <configuration>
             <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
             <enableRulesSummary>false</enableRulesSummary>
@@ -269,7 +269,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.15</version>
+        <version>${commons.checkstyle-plugin.version}</version>
         <configuration>
           <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 19aa92f..76a9da1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -73,7 +73,10 @@
       </action>
      <action type="update" dev="ggregory" due-to="Dependabot">
         Bump maven-antrun-plugin from 1.7 to 3.0.0 #43.
-      </action>
+     </action>
+     <action type="update" dev="ggregory" due-to="Gary Gregory">
+        Bump maven-checkstyle-plugin from 2.15 to 3.1.1 #41.
+     </action>
     </release>
 
     <release version="1.4" date="2017-03-09" description="New features and bug 
fixes">
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 1daf46a..f469667 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -17,8 +17,8 @@ limitations under the License.
 -->
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd";>
 
 <!-- Checkstyle configuration that checks the commons-cli coding conventions 
-->
 
@@ -47,16 +47,16 @@ limitations under the License.
       <property name="eachLine" value="true"/>
     </module>
 
-    <module name="TreeWalker">
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+    <module name="TreeWalker">
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowMissingJavadoc" value="true"/>
         </module>
         <module name="JavadocType"/>
         <module name="JavadocVariable"/>
@@ -85,9 +85,6 @@ limitations under the License.
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
         <!--<module name="FileLength"/>-->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="9"/>
@@ -135,9 +132,6 @@ limitations under the License.
         <module name="MagicNumber">
             <property name="ignoreNumbers" value="-1,0,1,2,3"/>
         </module>
-        <module name="RedundantThrows">
-            <property name="allowUnchecked" value="true"/>
-        </module>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>

Reply via email to