You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/09/16 16:11:05 UTC

svn commit: r1171576 - in /myfaces/myfaces-build-tools/trunk/other/checkstyle-rules: pom.xml src/main/resources/default/myfaces-checks-standard.xml

Author: struberg
Date: Fri Sep 16 14:11:04 2011
New Revision: 1171576

URL: http://svn.apache.org/viewvc?rev=1171576&view=rev
Log:
MYFACES-3307 upgrade myfaces-parent and fix checkstyle rules

This is needed for using it with checkstyle-5 and above.

Modified:
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml
    myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml

Modified: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml?rev=1171576&r1=1171575&r2=1171576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/pom.xml Fri Sep 16 14:11:04 2011
@@ -29,7 +29,7 @@
       -->
     <groupId>org.apache.myfaces</groupId>
     <artifactId>myfaces</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
 
   <groupId>org.apache.myfaces.buildtools</groupId>

Modified: myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml?rev=1171576&r1=1171575&r2=1171576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml (original)
+++ myfaces/myfaces-build-tools/trunk/other/checkstyle-rules/src/main/resources/default/myfaces-checks-standard.xml Fri Sep 16 14:11:04 2011
@@ -59,11 +59,6 @@
     <module name="FileLength">
         <property name="fileExtensions" value="java"/>
     </module>
-    <module name="LineLength">
-        <property name="max" value="120" />
-        <property name="ignorePattern" value="@version|@see"/>
-    </module>
-        
         
     <module name="TreeWalker">
 
@@ -84,6 +79,11 @@
         </module>
 -->
 
+        <module name="LineLength">
+            <property name="max" value="120" />
+            <property name="ignorePattern" value="@version|@see"/>
+        </module>
+        
         <module name="ConstantName">
           <!-- Normal rules, except that:
              -  * any name can start with an underscore.
@@ -112,7 +112,9 @@
 
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
+        <module name="AvoidStarImport">
+            <property name="allowStaticMemberImports" value="true"/>
+        </module>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>