Add checkstyle suppressions, allow empty blocks with text.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1439955 13f79535-47bb-0310-9956-ffa450edef68

Author: netomi

pom.xml

@@ -220,6 +220,7 @@
           <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
           <headerLocation>${basedir}/src/conf/HEADER.txt</headerLocation>
+	      <suppressionsLocation>${basedir}/src/conf/checkstyle-suppressions.xml</suppressionsLocation>
         </configuration>
         <reportSets>
           <reportSet>

src/conf/checkstyle-suppressions.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.0//EN" "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+
+  <!-- Suppress visibility check of some member fields as they have to be kept
+       for backwards compatibility reasons                                      -->
+  <suppress checks="VisibilityModifier" files="HelpFormatter.java" />
+
+</suppressions>

src/conf/checkstyle.xml

@@ -47,11 +47,9 @@ limitations under the License.
     </module>
 
     <!-- Exceptions -->
-    <!--
     <module name="SuppressionFilter">
-        <property name="file" value="conf/checkstyle-suppressions.xml"/>
+	    <property name="file" value="${checkstyle.suppressions.file}"/>
     </module>
-    -->
 
     <module name="FileTabCharacter">
       <property name="eachLine" value="true"/>
@@ -117,18 +115,17 @@ limitations under the License.
           <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
         </module>
 
-
-
         <!-- Modifier Checks                                    -->
         <!-- See http://checkstyle.sf.net/config_modifiers.html -->
         <module name="ModifierOrder"/>
         <module name="RedundantModifier"/>
 
-
         <!-- Checks for blocks. You know, those {}'s         -->
         <!-- See http://checkstyle.sf.net/config_blocks.html -->
         <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock"/>
+        <module name="EmptyBlock">
+            <property name="option" value="text"/>        
+        </module>
         <module name="LeftCurly">
             <property name="option" value="nl"/>
         </module>
@@ -137,7 +134,6 @@ limitations under the License.
             <property name="option" value="alone"/>
         </module>
 
-
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <module name="CovariantEquals"/>
@@ -172,8 +168,6 @@ limitations under the License.
             <property name="protectedAllowed" value="true"/>
         </module>
 
-
-
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
         <module name="ArrayTypeStyle"/>