commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r1005381 - in /commons/proper/validator/trunk: checkstyle.xml pom.xml
Date Thu, 07 Oct 2010 09:29:08 GMT
Author: niallp
Date: Thu Oct  7 09:29:08 2010
New Revision: 1005381

URL: http://svn.apache.org/viewvc?rev=1005381&view=rev
Log:
Upgrade maven-checkstyle-plugin from version 2.1 to 2.6

maven-checkstyle-plugin 2.4 onwards uses Checkstyle 5.0 (upgraded from Checkstyle 4.4). Checkstyle
5.0 is not 100% backwardly compatible with release 4.4 and the following changes need to be
made to make it work. See the Release Notes for details of incompatible changes and fixes
here:
    http://checkstyle.sourceforge.net/releasenotes.html

Modified:
    commons/proper/validator/trunk/checkstyle.xml
    commons/proper/validator/trunk/pom.xml

Modified: commons/proper/validator/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/checkstyle.xml?rev=1005381&r1=1005380&r2=1005381&view=diff
==============================================================================
--- commons/proper/validator/trunk/checkstyle.xml (original)
+++ commons/proper/validator/trunk/checkstyle.xml Thu Oct  7 09:29:08 2010
@@ -48,13 +48,6 @@
       <property name="classes" value="java.lang.Boolean, java.lang.String"/>
     </module>
 
-    <!-- Item 6 - Avoid finalizers -->
-    <!-- this will not find violations that contain linebreaks -->
-    <module name="GenericIllegalRegexp">
-      <property name="format"
-                value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
-    </module>
-
     <!-- Item 8 - Always override hashCode when you override equals -->
     <module name="EqualsHashCode"/>
 
@@ -133,18 +126,30 @@
 
     <!-- Item 57 - Provide a readResolve method when necessary -->
     <!-- no rfe yet -->
-    
-    <!-- don't allow tabs -->
-    <module name="TabCharacter"/>
-
-    <!-- enforce License Header -->
-    <module name="Header">
-      <property name="headerFile" value="${checkstyle.header.file}"/>
-    </module>
 
   </module>
 
   <!-- enforce package documentation -->
-  <module name="PackageHtml"/>
+  <module name="JavadocPackage">
+    <!-- setting allowLegacy means it will check for package.html instead of just package-info.java
-->
+    <property name="allowLegacy" value="true"/>
+  </module>
   
+  <!-- Item 6 - Avoid finalizers -->
+  <!-- this will not find violations that contain linebreaks -->
+  <module name="RegexpSingleline">
+    <property name="format" value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
+     <property name="message" value="Avoid finalizers."/>
+  </module>
+    
+  <!-- don't allow tabs -->
+  <module name="FileTabCharacter">
+    <property name="fileExtensions" value="java,xml"/>
+  </module>
+
+  <!-- enforce License Header -->
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
+
 </module>

Modified: commons/proper/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/pom.xml?rev=1005381&r1=1005380&r2=1005381&view=diff
==============================================================================
--- commons/proper/validator/trunk/pom.xml (original)
+++ commons/proper/validator/trunk/pom.xml Thu Oct  7 09:29:08 2010
@@ -235,7 +235,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.6</version>
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <enableRulesSummary>false</enableRulesSummary>



Mime
View raw message