From a7d0c88703be6532fb94f4d03c0e9b6052e0bf08 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 10 Nov 2003 11:57:00 +0000
Subject: [PATCH] Upgraded to checkstyle 3.2

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114291 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle/project.properties                  |  3 +--
 checkstyle/project.xml                         | 17 +++++++++++++++--
 checkstyle/src/plugin-resources/sun_checks.xml |  9 ++++++++-
 checkstyle/xdocs/changes.xml                   | 16 +++++++++++++---
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/checkstyle/project.properties b/checkstyle/project.properties
index b63ab92e..6fc6f3df 100644
--- a/checkstyle/project.properties
+++ b/checkstyle/project.properties
@@ -2,6 +2,5 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 maven.xdoc.date=left
-maven.xdoc.version=2.0
+maven.xdoc.version=${pom.currentVersion}
 maven.license.licenseFile=${basedir}/../LICENSE.txt
-
diff --git a/checkstyle/project.xml b/checkstyle/project.xml
index b4e6cf3e..4beeb434 100644
--- a/checkstyle/project.xml
+++ b/checkstyle/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-checkstyle-plugin</id>
   <name>Maven Checkstyle Plug-in</name>
-  <currentVersion>2.1</currentVersion>
+  <currentVersion>2.2-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Checkstyle report</shortDescription>
   <url>http://maven.apache.org/reference/plugins/checkstyle/</url>
@@ -25,6 +25,11 @@
       <name>2.0</name>
       <tag>MAVEN_CHECKSTYLE_2_0</tag>
     </version>
+    <version>
+      <id>2.2</id>
+      <name>2.2</name>
+      <tag>HEAD</tag>
+    </version>
   </versions>
   <developers>
     <developer>
@@ -91,7 +96,15 @@
     <dependency>
       <groupId>checkstyle</groupId>
       <artifactId>checkstyle</artifactId>
-      <version>3.1</version>
+      <version>3.2</version>
+      <properties>
+        <classloader>root</classloader>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>checkstyle</groupId>
+      <artifactId>checkstyle-optional</artifactId>
+      <version>3.2</version>
       <properties>
         <classloader>root</classloader>
       </properties>
diff --git a/checkstyle/src/plugin-resources/sun_checks.xml b/checkstyle/src/plugin-resources/sun_checks.xml
index 2efad25e..cfd9665e 100644
--- a/checkstyle/src/plugin-resources/sun_checks.xml
+++ b/checkstyle/src/plugin-resources/sun_checks.xml
@@ -54,6 +54,7 @@
         <module name="JavadocMethod"/>
         <module name="JavadocType"/>
         <module name="JavadocVariable"/>
+        <module name="JavadocStyle"/>
 
 
         <!-- Checks for Naming Conventions.                  -->
@@ -75,7 +76,12 @@
             <!-- 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.                   -->
+            <!-- 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}"/>
         </module>
 
@@ -106,6 +112,7 @@
         <module name="NoWhitespaceBefore"/>
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
         <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
diff --git a/checkstyle/xdocs/changes.xml b/checkstyle/xdocs/changes.xml
index 5cddf712..e8d4b1ae 100644
--- a/checkstyle/xdocs/changes.xml
+++ b/checkstyle/xdocs/changes.xml
@@ -8,10 +8,19 @@
 
   <body>
 
+    <release version="2.2" date="in CVS">
+    </release>
+
+    <release version="2.1" date="Unknown">
+    </release>
+
     <release version="2.0" date="2003-09-01">
-    
-      <action dev="dion" type="fix">Added ignoreLines 1, 6</action>
-      <action dev="dion" type="update">update to use maven.docs.*/maven.gen.docs</action>
+      <action dev="dion" type="fix">
+        Added ignoreLines 1, 6
+      </action>
+      <action dev="dion" type="update">
+        Update to use maven.docs.*/maven.gen.docs
+      </action>
       <action dev="dion" type="fix">
         Add maven dependency and classes directory to classpath. This stops
         'Unable to get class information for '&lt;classname&gt;' errors.
@@ -46,6 +55,7 @@
         violations in XML format) which is always created.
       </action>
     </release>
+
   </body>
 </document>