Author: bodewig
Date: Wed Jul 28 07:14:20 2010
New Revision: 979968
URL: http://svn.apache.org/viewvc?rev=979968&view=rev
Log:
fix checkstyle plugin at version 2.4 to avoid MCHECKSTYLE-130. CACTUS-273
Modified:
jakarta/cactus/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
jakarta/cactus/trunk/framework/pom.xml
jakarta/cactus/trunk/integration/pom.xml
jakarta/cactus/trunk/pom.xml
Modified:
jakarta/cactus/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml?rev=979968&r1=979967&r2=979968&view=diff
==============================================================================
---
jakarta/cactus/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
(original)
+++
jakarta/cactus/trunk/build-tools/src/main/resources/build-tools/checkstyle.xml
Wed Jul 28 07:14:20 2010
@@ -10,17 +10,29 @@ Description:
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
<module name="Checker">
<property name="severity" value="warning"/>
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="ignoreLines" value="4"/>
+ </module>
+ <module name="FileLength"/>
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="format"
value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
+ <property name="message" value="Avoid finalizers"/>
+ </module>
+ <module name="RegexpSingleline">
+ <property name="format" value="System\.(out|err)\."/>
+ <property name="message" value="Don't write directly to System.out our
System.err"/>
+ </module>
+ <module name="RegexpSingleline">
+ <property name="format" value="@author"/>
+ <property name="message" value="No @author tag allowed"/>
+ </module>
<module name="TreeWalker">
- <module name="FileLength"/>
- <module name="Header">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- <property name="ignoreLines" value="4"/>
- </module>
<module name="LineLength">
<property name="ignorePattern" value="(@version|@see|^import)"/>
<property name="max" value="120"/>
</module>
- <module name="TabCharacter"/>
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
@@ -78,21 +90,10 @@ Description:
<property name="publicMemberPattern" value="^[a-z][a-zA-Z0-9]*$"/>
</module>
<module name="FinalClass"/>
- <module name="GenericIllegalRegexp">
- <property name="format"
value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
- <property name="message" value="Avoid finalizers"/>
- </module>
- <module name="GenericIllegalRegexp">
- <property name="format" value="System\.(out|err)\."/>
- <property name="message" value="Don't write directly to System.out
our System.err"/>
- </module>
- <module name="GenericIllegalRegexp">
- <property name="format" value="@author"/>
- <property name="message" value="No @author tag allowed"/>
- </module>
- <module name="JavadocType">
+ <!--module name="JavadocType">
<property name="versionFormat" value="\$Id.*\$"/>
- </module>
+ <property name="allowUnknownTags" value="true"/>
+ </module-->
<module name="JavadocMethod">
<property name="allowUndeclaredRTE" value="true"/>
</module>
Modified: jakarta/cactus/trunk/framework/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/pom.xml?rev=979968&r1=979967&r2=979968&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/pom.xml (original)
+++ jakarta/cactus/trunk/framework/pom.xml Wed Jul 28 07:14:20 2010
@@ -35,11 +35,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.build.tools</artifactId>
- <version>1.8.0</version>
+
<version>1.8.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
Modified: jakarta/cactus/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/pom.xml?rev=979968&r1=979967&r2=979968&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/pom.xml (original)
+++ jakarta/cactus/trunk/integration/pom.xml Wed Jul 28 07:14:20 2010
@@ -41,11 +41,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.build.tools</artifactId>
- <version>1.8.0</version>
+
<version>1.8.2-SNAPSHOT</version>
</dependency>
</dependencies>
<configuration>
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=979968&r1=979967&r2=979968&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Wed Jul 28 07:14:20 2010
@@ -299,7 +299,7 @@
<dependency>
<groupId>checkstyle</groupId>
<artifactId>checkstyle</artifactId>
- <version>3.4</version>
+ <version>5.1</version>
</dependency>
<dependency>
<groupId>clover</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
