db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r999187 - in /db/torque/torque4/trunk/torque-maven-parent: pom.xml turbine-checkstyle.xml
Date Tue, 21 Sep 2010 02:14:24 GMT
Author: tfischer
Date: Tue Sep 21 02:14:24 2010
New Revision: 999187

URL: http://svn.apache.org/viewvc?rev=999187&view=rev
Log:
- update checkstyle plugin to version 2.5 which uses checkstyle 5, and update checkstyle configuration
accordingly (leaving the rules as they are)
- use new version for javadoc plugin
- use new version for pmd plugin and update configuration

Modified:
    db/torque/torque4/trunk/torque-maven-parent/pom.xml
    db/torque/torque4/trunk/torque-maven-parent/turbine-checkstyle.xml

Modified: db/torque/torque4/trunk/torque-maven-parent/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-parent/pom.xml?rev=999187&r1=999186&r2=999187&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-parent/pom.xml (original)
+++ db/torque/torque4/trunk/torque-maven-parent/pom.xml Tue Sep 21 02:14:24 2010
@@ -414,7 +414,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.6.1</version>
+        <version>2.7</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -424,12 +424,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
+        <configuration>
+          <linkXref>true</linkXref>
+          <targetJdk>1.5</targetJdk>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -454,7 +458,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.5</version>
         <configuration>
           <configLocation>${basedir}/../torque-maven-parent/turbine-checkstyle.xml</configLocation>
           <headerLocation>${basedir}/../torque-maven-parent/checkstyle-license.txt</headerLocation>

Modified: db/torque/torque4/trunk/torque-maven-parent/turbine-checkstyle.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-maven-parent/turbine-checkstyle.xml?rev=999187&r1=999186&r2=999187&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-maven-parent/turbine-checkstyle.xml (original)
+++ db/torque/torque4/trunk/torque-maven-parent/turbine-checkstyle.xml Tue Sep 21 02:14:24
2010
@@ -19,8 +19,8 @@
 -->
 
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
 <!--
 
@@ -51,12 +51,17 @@
 
 <module name="Checker">
 
-	<property name="localeCountry" value="US" />
-	<property name="localeLanguage" value="en" />
+    <property name="localeCountry" value="US" />
+    <property name="localeLanguage" value="en" />
+
+    <!-- 
+      Checks that a package documentation exists for each package.
+    -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+    <module name="JavadocPackage">
+        <property name="allowLegacy" value="true"/>
+    </module>
 
-    <!-- Checks that a package.html file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
 
     <!-- Checks whether files end with a new line.                        -->
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -66,6 +71,26 @@
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <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.                   -->
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="ignoreLines" value="1"/>
+    </module>
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="FileLength"/>
+
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+    <module name="FileTabCharacter"/>
+
+
     <module name="TreeWalker">
 
         <property name="cacheFile" value="${checkstyle.cache.file}"/>
@@ -119,21 +144,6 @@
         <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.                   -->
-            <property name="headerFile" value="${checkstyle.header.file}"/>
-            <property name="ignoreLines" value="1"/>
-        </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"/>
@@ -144,7 +154,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
 
@@ -156,9 +165,9 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
+        <module name="GenericWhitespace"/>
 
 
         <!-- Modifier Checks                                    -->
@@ -204,10 +213,10 @@
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
         <module name="ArrayTypeStyle"/>
-<!--         <module name="FinalParameters"/> -->
-        <module name="GenericIllegalRegexp">
-            <property name="format" value="\s+$"/>
-            <property name="message" value="Line has trailing spaces."/>
+        <module name="Regexp">
+           <property name="format" value="[ \t]+$"/>
+           <property name="illegalPattern" value="true"/>
+           <property name="message" value="Line has trailing spaces."/>
         </module>
         <module name="TodoComment"/>
         <module name="UpperEll"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message