From 104c588bce16d6f8827d2aadcdaa768233659098 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 13 Mar 2007 19:37:14 +0000
Subject: [PATCH] PR: MPPMD-29 Upgrade to PMD 3.9

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

diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index c19e138e..76d01a44 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -92,6 +92,8 @@
     <!-- Setup the classpath for pmd plugins -->
     <path id="pmd-classpath">
       <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
+      <pathelement path="${plugin.getDependencyPath('asm:asm')}" />
+      <pathelement path="${plugin.getDependencyPath('backport-util-concurrent:backport-util-concurrent')}" />
       <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
       <pathelement path="${plugin.getDependencyPath('oro:oro')}" />
       <pathelement path="${pom.getDependencyClasspath()}" />
@@ -198,9 +200,20 @@
   <goal name="pmd:cpd-report" 
     description="Generate duplicate source code report with CPD">
 
+    <!-- Setup the classpath for cpd task -->
+    <path id="cpd-classpath">
+      <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
+      <pathelement path="${plugin.getDependencyPath('asm:asm')}" />
+      <pathelement path="${plugin.getDependencyPath('backport-util-concurrent:backport-util-concurrent')}" />
+      <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
+      <pathelement path="${plugin.getDependencyPath('oro:oro')}" />
+      <pathelement path="${pom.getDependencyClasspath()}" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
     <!-- Define a CPD task from the PMD jar -->
     <taskdef name="cpd"
-      classpath="${plugin.getDependencyPath('pmd:pmd')}"
+      classpathref="cpd-classpath"
       classname="net.sourceforge.pmd.cpd.CPDTask"/>
 
     <!-- Run the CPD task  -->
diff --git a/pmd/project.xml b/pmd/project.xml
index 2a79ee19..b6ce9776 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -158,7 +158,7 @@
     <dependency>
       <groupId>pmd</groupId>
       <artifactId>pmd</artifactId>
-      <version>3.7</version>
+      <version>3.9</version>
       <url>http://pmd.sourceforge.net</url>
     </dependency>
     <dependency>
@@ -166,13 +166,16 @@
       <artifactId>oro</artifactId>
       <version>2.0.8</version>
     </dependency>
-<!--
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
       <version>3.0</version>
     </dependency>
--->
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+      <version>3.0</version>
+    </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
diff --git a/pmd/xdocs/changes.xml b/pmd/xdocs/changes.xml
index 1aa42f8c..a613ad13 100644
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@@ -25,7 +25,7 @@
   </properties>
   <body>
     <release version="1.10-SNAPSHOT" date="In SVN">
-      <action dev="jjensen" type="update">Upgrade to PMD 3.9.</action>
+      <action dev="jjensen" type="update" issue="MPPMD-29">Upgrade to PMD 3.9.</action>
       <action dev="jjensen" type="add">Add "Goals" page.</action>
       <action dev="jjensen" type="update">Update/clarify properties and add "Default" column to "Properties" page.</action>
       <action dev="ltheussl" type="fix" issue="MPPMD-30">Cannot run pmd with Strings rulesets.</action>