Author: simonetripodi
Date: Thu Mar 7 15:43:25 2013
New Revision: 1453922
URL: http://svn.apache.org/r1453922
Log:
releng: maven-checkstyle-plugin updated to latest released version, updated
checkstyle configuration
Modified:
commons/proper/fileupload/trunk/pom.xml
commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml
Modified: commons/proper/fileupload/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/pom.xml?rev=1453922&r1=1453921&r2=1453922&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/pom.xml (original)
+++ commons/proper/fileupload/trunk/pom.xml Thu Mar 7 15:43:25 2013
@@ -238,8 +238,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <!-- Version 2.10 is latest, but requires lots of changes to
configuration files -->
- <version>2.1</version>
+ <version>2.10</version>
<configuration>
<configLocation>${basedir}/src/checkstyle/fileupload_checks.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary>
Modified: commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml
URL:
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml?rev=1453922&r1=1453921&r2=1453922&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml
(original)
+++ commons/proper/fileupload/trunk/src/checkstyle/fileupload_checks.xml Thu
Mar 7 15:43:25 2013
@@ -74,6 +74,21 @@
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
<module name="Translation"/>
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+ <module name="RegexpHeader">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+
+ <!-- No tabs allowed! -->
+ <module name="FileTabCharacter"/>
+
+ <!-- Require package Javadoc -->
+ <module name="JavadocPackage"/>
<module name="TreeWalker">
@@ -119,13 +134,6 @@
<!-- <property name="headerFile"
value="${checkstyle.header.file}"/> -->
<!-- </module> -->
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
- <module name="RegexpHeader">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
-
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>
@@ -133,10 +141,6 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="FileLength"/>
<!-- Begin Custom for FileUpload -->
<module name="LineLength">
<property name="max" value="120"/>
@@ -155,10 +159,10 @@
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
<module name="WhitespaceAround"/>
+ <module name="GenericWhitespace"/>
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
@@ -182,7 +186,6 @@
<!-- Checks for common coding problems -->
<!-- See http://checkstyle.sf.net/config_coding.html -->
<module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<!-- Disabled for FileUpload: module name="HiddenField"/ -->
@@ -209,7 +212,7 @@
<!-- See http://checkstyle.sf.net/config_misc.html -->
<module name="ArrayTypeStyle"/>
<!-- Disabled for FileUpload: module name="FinalParameters"/ -->
- <module name="GenericIllegalRegexp">
+ <module name="RegexpSinglelineJava">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
