commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1696872 - in /commons/proper/bcel/trunk: checkstyle.xml checkstyle_maven.properties pom.xml
Date Thu, 20 Aug 2015 22:57:33 GMT
Author: sebb
Date: Thu Aug 20 22:57:32 2015
New Revision: 1696872

URL: http://svn.apache.org/r1696872
Log:
Update to latest Checkstyle, which does not support RedundantThrows or DoubleCheckedLocking
Fix up so both Maven and Eclipse can find the suppressions file

Added:
    commons/proper/bcel/trunk/checkstyle_maven.properties   (with props)
Modified:
    commons/proper/bcel/trunk/checkstyle.xml
    commons/proper/bcel/trunk/pom.xml

Modified: commons/proper/bcel/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/checkstyle.xml?rev=1696872&r1=1696871&r2=1696872&view=diff
==============================================================================
--- commons/proper/bcel/trunk/checkstyle.xml (original)
+++ commons/proper/bcel/trunk/checkstyle.xml Thu Aug 20 22:57:32 2015
@@ -128,16 +128,12 @@ limitations under the License.
     <!-- Checks for common coding problems               -->
     <!-- See http://checkstyle.sf.net/config_coding.html -->
     <module name="CovariantEquals"/>
-    <module name="DoubleCheckedLocking"/>
     <module name="EqualsHashCode"/>
     <module name="IllegalInstantiation"/>
     <!--module name="InnerAssignment"/-->
     <!-- module name="MagicNumber">
         <property name="ignoreNumbers" value="-1,0,1,2,3"/>
     </module-->
-    <module name="RedundantThrows">
-        <property name="allowUnchecked" value="true"/>
-    </module>
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>
     <module name="StringLiteralEquality"/>
@@ -176,7 +172,8 @@ limitations under the License.
   <module name="SuppressionCommentFilter"/>
 
   <module name="SuppressionFilter">
-    <property name="file" value="checkstyle_suppressions.xml"/>
+    <!-- config_loc is used by Eclipse plugin -->
+    <property name="file" value="${config_loc}/checkstyle_suppressions.xml"/>
   </module>
 
 </module>

Added: commons/proper/bcel/trunk/checkstyle_maven.properties
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/checkstyle_maven.properties?rev=1696872&view=auto
==============================================================================
--- commons/proper/bcel/trunk/checkstyle_maven.properties (added)
+++ commons/proper/bcel/trunk/checkstyle_maven.properties Thu Aug 20 22:57:32 2015
@@ -0,0 +1 @@
+config_loc=.

Propchange: commons/proper/bcel/trunk/checkstyle_maven.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: commons/proper/bcel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/pom.xml?rev=1696872&r1=1696871&r2=1696872&view=diff
==============================================================================
--- commons/proper/bcel/trunk/pom.xml (original)
+++ commons/proper/bcel/trunk/pom.xml Thu Aug 20 22:57:32 2015
@@ -55,6 +55,7 @@
     <commons.jira.id>BCEL</commons.jira.id>
     <commons.jira.pid>12314220</commons.jira.pid>
     <findbugs.plugin.version>2.5.5</findbugs.plugin.version>
+    <checkstyle.plugin.version>2.16</checkstyle.plugin.version>
   </properties>
 
   <!-- Cannot be added to Commons Parent, see https://issues.apache.org/jira/browse/COMMONSSITE-26
-->
@@ -240,12 +241,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <!-- Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target'
-          dir and wants license headers in .properties to be the header for
-          Java files. -->
-        <version>2.9.1</version>
+        <version>${checkstyle.plugin.version}</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <!-- Needed to define config_loc -->
+          <propertiesLocation>${basedir}/checkstyle_maven.properties</propertiesLocation>
           <enableRulesSummary>false</enableRulesSummary>
         </configuration>
       </plugin>
@@ -274,12 +274,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <!-- Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target'
-          dir and wants license headers in .properties to be the header for
-          Java files. -->
-        <version>2.9.1</version>
+        <version>${checkstyle.plugin.version}</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
+          <!-- Needed to define config_loc -->
+          <propertiesLocation>${basedir}/checkstyle_maven.properties</propertiesLocation>
           <enableRulesSummary>false</enableRulesSummary>
         </configuration>
         <!-- We need to specify reportSets because 2.9.1 creates two reports -->



Mime
View raw message