commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r1034839 - in /commons/proper/vfs/trunk: checkstyle.xml pom.xml
Date Sat, 13 Nov 2010 18:41:56 GMT
Author: rgoers
Date: Sat Nov 13 18:41:56 2010
New Revision: 1034839

URL: http://svn.apache.org/viewvc?rev=1034839&view=rev
Log:
update checkstyle version

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

Modified: commons/proper/vfs/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/checkstyle.xml?rev=1034839&r1=1034838&r2=1034839&view=diff
==============================================================================
--- commons/proper/vfs/trunk/checkstyle.xml (original)
+++ commons/proper/vfs/trunk/checkstyle.xml Sat Nov 13 18:41:56 2010
@@ -26,8 +26,10 @@
     <property name="localeLanguage" value="en"/>
 
     <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <!-- See http://checkstyle.sourceforge.net/config_javadoc.html -->
+    <module name="JavadocPackage">
+      <property name="allowLegacy" value="true"/>
+    </module>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -37,6 +39,28 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <!-- Checks for Headers                              -->
+    <!-- See http://checkstyle.sourceforge.net/config_header.html#Header -->
+    <module name="Header">
+        <property name="headerFile" value="${licensedir}"/>
+        <property name="fileExtensions" value="java"/>
+        <!--<property name="ignoreLines" value="2"/> -->
+    </module>
+
+    <!-- Checks for Tab characters -->
+    <!-- See http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter
-->
+    <module name="FileTabCharacter">
+        <property name="fileExtensions" value="java"/>
+    </module>
+
+    <!-- Checks for white space at the end of the line -->
+    <!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
+    <module name="RegexpSingleline">
+      <property name="format" value="\s+$"/>
+      <property name="message" value="Line has trailing spaces."/>
+      <property name="fileExtensions" value="java"/>
+    </module>
+
     <!-- Exceptions -->
     <!--<module name="SuppressionFilter">
         <property name="file" value="conf/checkstyle-suppressions.xml"/>
@@ -55,6 +79,8 @@
         </module>
         <module name="JavadocType">
             <property name="authorFormat" value="\S"/>
+            <!-- It is unfortunate to have to do this but checkstyle doesn't allow custom
tags -->
+            <property name="allowUnknownTags" value="true"/>
         </module>
         <module name="JavadocVariable">
             <property name="scope" value="protected"/>
@@ -76,14 +102,6 @@
         <module name="StaticVariableName"/>
         <module name="TypeName"/>
 
-
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
-            <property name="headerFile" value="${licensedir}"/>
-            <!--<property name="ignoreLines" value="2"/> -->
-        </module>
-
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
 
@@ -118,9 +136,9 @@
            <property name="option" value="eol"/>
         </module>
         <module name="ParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
+        <module name="GenericWhitespace"/>
 
 
         <!-- Modifier Checks                                    -->
@@ -185,10 +203,6 @@
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
         <module name="ArrayTypeStyle"/>
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
-        </module>
         <module name="TodoComment">
             <property name="severity" value="info"/>
         </module>

Modified: commons/proper/vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1034839&r1=1034838&r2=1034839&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Sat Nov 13 18:41:56 2010
@@ -134,7 +134,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.6</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -156,6 +156,23 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>5.3</version>
+            <exclusions>
+              <exclusion>  <!-- exclude older artifacts -->
+                <groupId>checkstyle</groupId>
+                <artifactId>checkstyle</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>com.sun</groupId>
+                <artifactId>tools</artifactId>
+              </exclusion>
+             </exclusions>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.commons</groupId>
@@ -195,7 +212,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.6</version>
         <configuration>
           <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
           <configLocation>${vfs.parent.dir}/checkstyle.xml</configLocation>
@@ -218,6 +235,14 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.5</version>
         <configuration>
+           <tags>
+            <tag>
+              <name>todo</name>
+              <!-- todo tag for all places -->
+              <placement>a</placement>
+              <head>To Do:</head>
+            </tag>
+          </tags>
           <aggregate>true</aggregate>
         </configuration>
       </plugin>



Mime
View raw message