commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l..@apache.org
Subject svn commit: r1392540 - in /commons/sandbox/nabla/trunk: checkstyle.xml pom.xml
Date Mon, 01 Oct 2012 19:29:28 GMT
Author: luc
Date: Mon Oct  1 19:29:28 2012
New Revision: 1392540

URL: http://svn.apache.org/viewvc?rev=1392540&view=rev
Log:
Updated build configuration.

Modified:
    commons/sandbox/nabla/trunk/checkstyle.xml
    commons/sandbox/nabla/trunk/pom.xml

Modified: commons/sandbox/nabla/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/checkstyle.xml?rev=1392540&r1=1392539&r2=1392540&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/checkstyle.xml (original)
+++ commons/sandbox/nabla/trunk/checkstyle.xml Mon Oct  1 19:29:28 2012
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
+
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
        http://www.apache.org/licenses/LICENSE-2.0
 
@@ -14,89 +15,153 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
--->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-                        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+  -->
+
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
 
+<!-- commons math customization of default Checkstyle behavior -->
 <module name="Checker">
-    <module name="PackageHtml"/>
-    <module name="TreeWalker">
-        <module name="AvoidStarImport"/>
-        <module name="ConstantName"/>
-        <module name="DeclarationOrder"/>
-        <module name="EqualsHashCode"/>
-        <module name="FallThrough"/>
-        <module name="FinalLocalVariable"/>
-        <module name="FinalParameters"/>
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s$"/>
-            <property name="message" value="spurious spaces at end of line"/>
-        </module>
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="@author"/>
-            <property name="message" value="developers names should be in pom file"/>
-        </module>
-        <module name="Header">
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-        </module>
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-        </module>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="IllegalCatch"/>
-        <module name="IllegalImport"/>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="0"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-        </module>
-        <module name="JavadocStyle"/>
-        <module name="JavadocType"/>
-        <module name="JavadocVariable"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="ModifierOrder"/>
-        <module name="MultipleStringLiterals"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap">
-            <property name="option" value="eol"/>
-        </module>
-        <module name="RedundantModifier"/>
-        <module name="StringLiteralEquality"/>
-        <module name="TabCharacter"/>
-        <module name="TodoComment"/>
-        <module name="UnnecessaryParentheses"/>
-        <module name="UnusedImports"/>
-        <module name="VisibilityModifier"/>
-        <module name="WhitespaceAround">
-            <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_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"/>
-        </module>
+  <property name="localeLanguage" value="en"/>
+
+  <module name="TreeWalker">
+
+    <property name="cacheFile" value="target/checkstyle-cachefile"/>
+
+    <!-- Operator must be at end of wrapped line -->
+    <module name="OperatorWrap">
+      <property name="option" value="eol"/>
+    </module>
+
+    <!-- No if/else/do/for/while without braces -->
+    <module name="NeedBraces"/>
+
+    <!-- Interfaces must be types (not just constants) -->
+    <module name="InterfaceIsType"/>
+
+    <!-- Must have class / interface header comments including scm version -->
+    <module name="JavadocType">
+        <property name="versionFormat" value="\$Id.*\$"/>
+    </module>
+        
+     <!-- Require method javadocs, allow undeclared RTE -->
+    <module name="JavadocMethod">
+      <property name="allowUndeclaredRTE" value="true"/>
+    </module>
+        
+    <!-- Require field javadoc -->
+    <module name="JavadocVariable"/>
+        
+    <!-- No public fields -->
+    <module name="VisibilityModifier">
+       <property name="protectedAllowed" value="true"/>
+    </module>
+
+    <!-- Require hash code override when equals is -->
+    <module name="EqualsHashCode"/>
+    
+    <!-- Disallow unnecessary instantiation of Boolean, String -->
+    <module name="IllegalInstantiation">
+      <property name="classes" value="java.lang.Boolean, java.lang.String"/>
+    </module>
+
+    <!-- Required for SuppressionCommentFilter below -->
+    <module name="FileContentsHolder"/>
+ 
+    <!--  Import should be explicit, really needed and only from pure java packages -->
+    <module name="AvoidStarImport" />
+    <module name="UnusedImports" />
+    <module name="IllegalImport" />
+
+    <!-- Utility class should not be instantiated, they must have a private constructor
-->
+    <module name="HideUtilityClassConstructor" />
+
+    <!-- Switch statements should be complete and with independent cases -->
+    <module name="FallThrough" />
+    <module name="MissingSwitchDefault" />
+
+    <!-- Constant names should obey the traditional all uppercase naming convention -->
+    <module name="ConstantName" />
+
+    <!-- Method parameters and local variables should not hide fields, except in constructors
and setters -->
+    <module name="HiddenField">
+        <property name="ignoreConstructorParameter" value="true" />
+        <property name="ignoreSetter" value="true" />
+    </module>
+    
+    <!-- No trailing whitespace -->
+    <module name="Regexp">
+      <property name="format" value="[ \t]+$"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Trailing whitespace"/>
+    </module>
+    
+    <!-- No System.out.println() statements -->
+    <module name="Regexp">
+      <!-- no sysouts -->
+      <property name="format" value="System\.out\.println"/>
+      <property name="illegalPattern" value="true"/>
+    </module>
+
+    <!-- Authors should be in pom.xml file -->
+    <module name="Regexp">
+      <property name="format" value="@author"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="developers names should be in pom file"/>
+    </module>
+
+    <!-- Use a consistent way to put modifiers -->
+    <module name="RedundantModifier" />
+    <module name="ModifierOrder" />
+
+    <!-- Use a consistent way to put declarations -->
+    <module name="DeclarationOrder" />
+
+    <!-- Don't add up parentheses when they are not required -->
+    <module name="UnnecessaryParentheses" />
+
+    <!--  Don't use too widespread catch (Exception, Throwable, RuntimeException)  -->
+    <module name="IllegalCatch" />
+
+    <!-- Don't use = or != for string comparisons -->
+    <module name="StringLiteralEquality" />
+ 
+   <!-- Don't declare multiple variables in the same statement -->
+    <module name="MultipleVariableDeclarations" />
+
+    <!-- String literals more than one character long should not be repeated several times
-->
+    <!-- the "unchecked" string is also accepted to allow @SuppressWarnings("unchecked")
-->
+    <module name="MultipleStringLiterals" >
+      <property name="ignoreStringsRegexp" value='^(("")|(".")|("unchecked"))$'/>
+    </module>
+
+    <!-- <module name="TodoComment" /> -->
+
+  </module>
+
+  <!-- Verify that EVERY source file has the appropriate license -->
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
 
-        <!-- Required for SuppressionCommentFilter below -->
-        <module name="FileContentsHolder"/>
+  <!-- No tabs allowed! -->
+  <module name="FileTabCharacter"/>
 
-      </module>
+  <!-- Require files to end with newline characters -->
+  <module name="NewlineAtEndOfFile"/>
   
-      <!-- Setup special comments to suppress specific checks from source files -->
-      <module name="SuppressionCommentFilter">
-          <property name="offCommentFormat" value="CHECKSTYLE\: stop HideUtilityClassConstructor"/>
-          <property name="onCommentFormat"  value="CHECKSTYLE\: resume HideUtilityClassConstructor"/>
-          <property name="checkFormat"      value="HideUtilityClassConstructor"/>
-      </module>
+  <!-- Require package javadoc -->
+  <module name="JavadocPackage"/>
 
-      <module name="NewlineAtEndOfFile"/>
+  <!-- Setup special comments to suppress specific checks from source files -->
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable"/>
+    <property name="onCommentFormat"  value="CHECKSTYLE\: resume JavadocVariable"/>
+    <property name="checkFormat"      value="JavadocVariable"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE\: stop MultipleVariableDeclarations"/>
+    <property name="onCommentFormat"  value="CHECKSTYLE\: resume MultipleVariableDeclarations"/>
+    <property name="checkFormat"      value="MultipleVariableDeclarations"/>
+  </module>
 
 </module>

Modified: commons/sandbox/nabla/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/nabla/trunk/pom.xml?rev=1392540&r1=1392539&r2=1392540&view=diff
==============================================================================
--- commons/sandbox/nabla/trunk/pom.xml (original)
+++ commons/sandbox/nabla/trunk/pom.xml Mon Oct  1 19:29:28 2012
@@ -140,7 +140,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.7.1</version>
                 <configuration>
                     <linkXref>true</linkXref>
                     <targetJdk>1.6</targetJdk>
@@ -149,17 +149,17 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.9.1</version>
                 <configuration>
                     <configLocation>${basedir}/checkstyle.xml</configLocation>
                     <enableRulesSummary>false</enableRulesSummary>



Mime
View raw message