commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1243772 - in /commons/proper/pool/branches/POOL_1_X: build.xml checkstyle.xml pom.xml src/java/org/apache/commons/pool/overview.html src/main/ src/main/javadoc/ src/main/javadoc/overview.html
Date Tue, 14 Feb 2012 02:59:47 GMT
Author: ggregory
Date: Tue Feb 14 02:59:46 2012
New Revision: 1243772

URL: http://svn.apache.org/viewvc?rev=1243772&view=rev
Log:
Update maven-checkstyle-plugin to 2.9 from 2.1.
Update maven-pmd-plugin to 2.7 from 2.5.
Update to package-info.java from package.html.
Use standard Maven Javadoc plugin layout for overview.html which was previously ignored!

Added:
    commons/proper/pool/branches/POOL_1_X/src/main/
    commons/proper/pool/branches/POOL_1_X/src/main/javadoc/
    commons/proper/pool/branches/POOL_1_X/src/main/javadoc/overview.html
      - copied unchanged from r1229462, commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/overview.html
Removed:
    commons/proper/pool/branches/POOL_1_X/src/java/org/apache/commons/pool/overview.html
Modified:
    commons/proper/pool/branches/POOL_1_X/build.xml
    commons/proper/pool/branches/POOL_1_X/checkstyle.xml
    commons/proper/pool/branches/POOL_1_X/pom.xml

Modified: commons/proper/pool/branches/POOL_1_X/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/build.xml?rev=1243772&r1=1243771&r2=1243772&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/build.xml (original)
+++ commons/proper/pool/branches/POOL_1_X/build.xml Tue Feb 14 02:59:46 2012
@@ -44,6 +44,7 @@
       <property name="package" value="org.apache.commons.pool.*"/>
 
       <property name="src.dir" value="${basedir}/src"/>
+      <property name="src.main.dir" value="${src.dir}/main"/>
       <property name="src.java.dir" value="${src.dir}/java"/>
       <property name="src.test.dir" value="${src.dir}/test"/>
       <property name="build.dir" value="${basedir}/build"/>
@@ -56,7 +57,7 @@
      
       <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
       <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy;
2001-2012 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
-      <property name="javadoc.overview" value="${src.java.dir}/org/apache/commons/pool/overview.html"
/>
+      <property name="javadoc.overview" value="${src.main.dir}/javadoc/overview.html"
/>
 
       <property name="javac.optimize" value="false"/>
       <property name="javac.debug" value="true"/>

Modified: commons/proper/pool/branches/POOL_1_X/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/checkstyle.xml?rev=1243772&r1=1243771&r2=1243772&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/checkstyle.xml (original)
+++ commons/proper/pool/branches/POOL_1_X/checkstyle.xml Tue Feb 14 02:59:46 2012
@@ -28,12 +28,18 @@
 
   <property name="localeLanguage" value="en"/>
 
+  <!-- Verify that EVERY source file has the appropriate license -->
+  <module name="Header">
+    <property name="headerFile" value="${checkstyle.header.file}"/>
+  </module>
+
+  <!-- No tabs allowed! -->
+  <module name="FileTabCharacter"/>
+
+  <!-- Require package javadoc -->
+  <module name="JavadocPackage"/>
+
   <module name="TreeWalker">
-   
-    <!-- Verify that EVERY source file has the appropriate license -->
-    <module name="Header">
-      <property name="headerFile" value="${checkstyle.header.file}"/>
-    </module>
 
     <!-- Operator must be at end of wrapped line -->
     <module name="OperatorWrap">
@@ -43,8 +49,6 @@
     <!-- Interfaces must be types (not just constants) -->
     <module name="InterfaceIsType"/>
 
-    <!-- Must have class / interface header comments -->
-    <module name="JavadocType"/>
         
      <!-- Require method javadocs, allow undeclared RTE -->
     <module name="JavadocMethod">
@@ -54,10 +58,7 @@
         
     <!-- Require field javadoc -->
     <module name="JavadocVariable"/>
-        
-    <!-- No tabs allowed! -->
-    <module name="TabCharacter"/>
-    
+            
     <!-- No public fields -->
     <module name="VisibilityModifier">
        <property name="protectedAllowed" value="true"/>
@@ -76,9 +77,6 @@
 
   </module>
   
-  <!-- Require package javadoc -->
-  <module name="PackageHtml"/>
-
   <!-- Setup special comments to suppress specific checks from source files -->
   <module name="SuppressionCommentFilter">
     <property name="offCommentFormat" value="CHECKSTYLE\: stop all checks"/>

Modified: commons/proper/pool/branches/POOL_1_X/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/branches/POOL_1_X/pom.xml?rev=1243772&r1=1243771&r2=1243772&view=diff
==============================================================================
--- commons/proper/pool/branches/POOL_1_X/pom.xml (original)
+++ commons/proper/pool/branches/POOL_1_X/pom.xml Tue Feb 14 02:59:46 2012
@@ -255,7 +255,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.9</version>
           <configuration>
             <configLocation>${basedir}/checkstyle.xml</configLocation>
             <enableRulesSummary>false</enableRulesSummary>
@@ -280,7 +280,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.7</version>
           <configuration>
             <targetJdk>1.5</targetJdk>
           </configuration>



Mime
View raw message