From 9bafc7f7e81d33f89bfa0fb6149494304ed3d06c Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 10 Nov 2003 14:16:40 +0000
Subject: [PATCH] Apply MAVEN-1008:  Patch to add the project dependancies to
 the pmd classpath. This should allow a custom ruleset jar file that is
 defined as a dependancy to be added to the pmd classpath.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114303 13f79535-47bb-0310-9956-ffa450edef68
---
 pmd/plugin.jelly      | 19 ++++++++++++-------
 pmd/project.xml       |  2 +-
 pmd/xdocs/changes.xml |  6 ++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index 710c7d9d..055772f3 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -61,15 +61,20 @@
     <mkdir dir="${maven.build.dir}"/>
     <mkdir dir="${maven.docs.dest}"/>
 
+    <!-- Setup the classpath for pmd plugins -->
+    <path id="pmd-classpath">
+      <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
+      <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
+      <pathelement path="${plugin.getDependencyPath('saxpath:saxpath')}" />
+      <pathelement path="${pom.getDependencyClasspath()}" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
     <!-- Define a PMD task with the rulesets and all jars in the 
          classpath -->   
-    <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
-      <classpath>
-        <pathelement location="${plugin.getDependencyPath('pmd:pmd')}"/>
-        <pathelement location="${plugin.getDependencyPath('jaxen:jaxen')}"/>
-        <pathelement location="${plugin.getDependencyPath('saxpath:saxpath')}"/>
-      </classpath>
-    </taskdef>
+    <taskdef name="pmd" 
+      classpathref="pmd-classpath"
+      classname="net.sourceforge.pmd.ant.PMDTask" />
         
     <!-- Run the PMD task - need a way to define the rulesets dynamically -->
     <echo>Running the PMD task with ${maven.pmd.rulesetfiles} ...</echo>
diff --git a/pmd/project.xml b/pmd/project.xml
index 8666dc50..cd054f70 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-pmd-plugin</id>
   <name>Maven PMD Plug-in</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description>This plugin provides a more or less seamless integration with Maven and the PMD static source code analyzer.</description>
   <shortDescription>Maven Plugin for PMD</shortDescription>
   <url>http://maven.apache.org/reference/plugins/pmd/</url>
diff --git a/pmd/xdocs/changes.xml b/pmd/xdocs/changes.xml
index 00a33937..50a3d8b6 100644
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@@ -8,6 +8,12 @@
 
   <body>
 
+    <release version="1.3" date="in CVS">
+      <action dev="dion" type="update">
+        Apply MAVEN-1008. Allow for custom rulesets in the classpath.
+      </action>
+    </release>
+
     <release version="1.2" date="2003-09-20">
       <action dev="vmassol" type="update">
         Upgraded to use PMD 1.2.1.