Author: henrib
Date: Fri Mar 26 16:59:04 2010
New Revision: 927966
URL: http://svn.apache.org/viewvc?rev=927966&view=rev
Log:
Updated maven plugins versions;
Modified checkstyle config to reflect 5.0 changes
Modified:
commons/proper/jexl/trunk/pom.xml
commons/proper/jexl/trunk/src/main/config/checkstyle.xml
Modified: commons/proper/jexl/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/pom.xml?rev=927966&r1=927965&r2=927966&view=diff
==============================================================================
--- commons/proper/jexl/trunk/pom.xml (original)
+++ commons/proper/jexl/trunk/pom.xml Fri Mar 26 16:59:04 2010
@@ -214,7 +214,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
<configuration>
<xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -230,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<configuration>
<configLocation>${basedir}/src/main/config/checkstyle.xml</configLocation>
<excludes>org/apache/commons/jexl2/parser/*.java</excludes>
@@ -254,7 +254,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.1</version>
+ <version>2.3.1</version>
<configuration>
<excludes>
<exclude>org/apache/commons/jexl2/parser/*.class</exclude>
Modified: commons/proper/jexl/trunk/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/config/checkstyle.xml?rev=927966&r1=927965&r2=927966&view=diff
==============================================================================
--- commons/proper/jexl/trunk/src/main/config/checkstyle.xml (original)
+++ commons/proper/jexl/trunk/src/main/config/checkstyle.xml Fri Mar 26 16:59:04 2010
@@ -18,9 +18,8 @@
*/
-->
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<!--
@@ -53,7 +52,9 @@
<!-- 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 -->
@@ -68,6 +69,25 @@
<module name="Translation"/>
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="Header">
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. See property -->
+ <!-- expansion, -->
+ <!-- http://checkstyle.sf.net/config.html#properties -->
+ <!-- <property -->
+ <!-- name="headerFile" -->
+ <!-- value="${basedir}/java.header"/> -->
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="ignoreLines" value="2"/>
+ </module>
+
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -94,28 +114,7 @@
<module name="ParameterName"/>
<module name="StaticVariableName"/>
<module name="TypeName"/>
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="Header">
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <property name="headerFile" value="${checkstyle.header.file}"/>
- <property name="ignoreLines" value="2"/>
- </module>
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
+
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
<module name="AvoidStarImport"/>
@@ -126,7 +125,6 @@
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="FileLength"/>
<module name="LineLength">
<!-- JEXL: added max, ignore @version and @see -->
<property name="max" value="120"/>
@@ -140,8 +138,7 @@
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
- <!-- <module name="GenericWhitespace"/> -->
- <!-- JEXL-20: because the above is not yet supported through Maven plugin, disable
others-->
+ <module name="GenericWhitespace"/>
<!-- <module name="NoWhitespaceAfter"/> -->
<!-- <module name="NoWhitespaceBefore"/> -->
<!-- <module name="WhitespaceAfter"/> -->
@@ -149,7 +146,6 @@
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<!-- Modifier Checks -->
@@ -217,4 +213,4 @@
<property name="checkFormat" value="$1"/>
</module>
-</module>
\ No newline at end of file
+</module>
|