svn commit: r1005368 - in /commons/proper/beanutils/trunk: checkstyle.xml pom.xml

[ni...@apache.org]

Author: niallp
Date: Thu Oct  7 09:01:59 2010
New Revision: 1005368

URL: http://svn.apache.org/viewvc?rev=1005368&view=rev
Log:
Upgrade maven-checkstyle-plugin from version 2.3 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/beanutils/trunk/checkstyle.xml
    commons/proper/beanutils/trunk/pom.xml

Modified: commons/proper/beanutils/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/checkstyle.xml?rev=1005368&r1=1005367&r2=1005368&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/checkstyle.xml (original)
+++ commons/proper/beanutils/trunk/checkstyle.xml Thu Oct  7 09:01:59 2010
@@ -23,9 +23,17 @@ limitations under the License.
 <!-- commons lang customization of default Checkstyle behavior -->
 <module name="Checker">
   <property name="localeLanguage" value="en"/>
-  <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>
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
+  <module name="FileTabCharacter">
+    <property name="fileExtensions" value="java,xml"/>
+  </module>
   <module name="TreeWalker">
-    <module name="TabCharacter"/>
     <module name="AvoidStarImport"/>
     <module name="RedundantImport"/>
     <module name="UnusedImports"/>
@@ -43,9 +51,6 @@ limitations under the License.
       <property name="scope" value="protected"/>
       <property name="allowUndeclaredRTE" value="true"/>
     </module>
-    <module name="Header">
-      <property name="headerFile" value="${checkstyle.header.file}"/>
-    </module>
  </module>
 </module>
                         

Modified: commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=1005368&r1=1005367&r2=1005368&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Thu Oct  7 09:01:59 2010
@@ -217,7 +217,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.6</version>
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <enableRulesSummary>false</enableRulesSummary>