commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r1157212 - in /commons/proper/configuration/trunk: conf/checkstyle.xml pom.xml
Date Fri, 12 Aug 2011 18:54:25 GMT
Author: oheger
Date: Fri Aug 12 18:54:24 2011
New Revision: 1157212

URL: http://svn.apache.org/viewvc?rev=1157212&view=rev
Log:
Updated to most recent version of checkstyle plug-in. Make site generation work again.

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

Modified: commons/proper/configuration/trunk/conf/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/conf/checkstyle.xml?rev=1157212&r1=1157211&r2=1157212&view=diff
==============================================================================
--- commons/proper/configuration/trunk/conf/checkstyle.xml (original)
+++ commons/proper/configuration/trunk/conf/checkstyle.xml Fri Aug 12 18:54:24 2011
@@ -2,15 +2,35 @@
 <!DOCTYPE module PUBLIC
     "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
     "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-
+<!--
+   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
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.
+-->
+<!-- ===================================================================== -->
 <!-- Checkstyle configuration that checks the commons-configuration coding conventions
-->
+<!-- $Id$ -->
+<!-- ===================================================================== -->
 
 <module name="Checker">
     <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"/>
+    <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 -->
@@ -25,6 +45,20 @@
         <property name="file" value="${basedir}/conf/checkstyle-suppressions.xml"/>
     </module>
 
+    <!-- Checks for Headers                              -->
+    <!-- See http://checkstyle.sf.net/config_header.html -->
+    <module name="Header">
+        <property name="headerFile" value="${basedir}/conf/HEADER.txt"/>
+        <property name="ignoreLines" value="2"/>
+    </module>
+
+    <module name="FileTabCharacter"/>
+    <module name="RegexpSingleline">
+        <!-- \s matches whitespace character, $ matches end of line. -->
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Line has trailing spaces."/>
+    </module>
+
     <module name="TreeWalker">
 
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -55,13 +89,6 @@
         <module name="TypeName"/>
 
 
-        <!-- Checks for Headers                              -->
-        <!-- See http://checkstyle.sf.net/config_header.html -->
-        <module name="Header">
-            <property name="headerFile" value="${basedir}/conf/HEADER.txt"/>
-            <property name="ignoreLines" value="2"/>
-        </module>
-
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
 
@@ -91,7 +118,6 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
@@ -154,10 +180,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/configuration/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1157212&r1=1157211&r2=1157212&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Fri Aug 12 18:54:24 2011
@@ -651,7 +651,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.7</version>
         <configuration>
           <configLocation>${basedir}/conf/checkstyle.xml</configLocation>
           <suppressionsLocation>${basedir}/conf/checkstyle-suppressions.xml</suppressionsLocation>



Mime
View raw message