You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sg...@apache.org on 2012/03/04 22:58:37 UTC

svn commit: r1296886 - in /commons/proper/email/trunk: conf/checkstyle.xml pom.xml

Author: sgoeschl
Date: Sun Mar  4 21:58:36 2012
New Revision: 1296886

URL: http://svn.apache.org/viewvc?rev=1296886&view=rev
Log:
[EMAIL-113] Fixing broken Checkstyle report

Modified:
    commons/proper/email/trunk/conf/checkstyle.xml
    commons/proper/email/trunk/pom.xml

Modified: commons/proper/email/trunk/conf/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/conf/checkstyle.xml?rev=1296886&r1=1296885&r2=1296886&view=diff
==============================================================================
--- commons/proper/email/trunk/conf/checkstyle.xml (original)
+++ commons/proper/email/trunk/conf/checkstyle.xml Sun Mar  4 21:58:36 2012
@@ -25,8 +25,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.sf.net/config_javadoc.html#JavadocPackage -->
+    <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 -->
@@ -36,6 +38,18 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <!-- Checks for Headers                              -->
+    <!-- See http://checkstyle.sf.net/config_header.html -->
+    <module name="Header">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+    </module>
+    <module name="FileLength"/>
+    <module name="FileTabCharacter"/>
+
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
 
     <module name="TreeWalker">
 
@@ -64,12 +78,6 @@
         <module name="TypeName"/>
 
 
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
-
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
 
@@ -84,7 +92,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="LineLength">
             <property name="max" value="120"/>
         </module>
@@ -99,7 +106,6 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
@@ -164,10 +170,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"/>
         <module name="UpperEll"/>
 

Modified: commons/proper/email/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1296886&r1=1296885&r2=1296886&view=diff
==============================================================================
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Sun Mar  4 21:58:36 2012
@@ -346,7 +346,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8</version>
                 <configuration>
                     <configLocation>${basedir}/conf/checkstyle.xml</configLocation>
                     <enableRulesSummary>false</enableRulesSummary>