From d3eb8282a76187440bf42ddb81f4551498d45575 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 12 Jun 2004 04:52:28 +0000
Subject: [PATCH] PR: MPCLOVER-15 Make maven.clover.jar work

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115461 13f79535-47bb-0310-9956-ffa450edef68
---
 clover/plugin.jelly      | 11 ++++-------
 clover/project.xml       |  5 +----
 clover/xdocs/changes.xml |  3 +++
 3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 656ea0d1..5a69e209 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -51,25 +51,22 @@
     <ant:path id="clover.classpath">
       <j:choose>
         <j:when test="${context.getVariable('maven.clover.jar') != null}">
-          <ant:pathelement path="${maven.clover.jar}"/>
+          <ant:pathelement location="${maven.clover.jar}"/>
         </j:when>
         <j:otherwise>
-          <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
+          <ant:pathelement location="${plugin.getDependencyPath('clover')}"/>
         </j:otherwise>
       </j:choose>
     </ant:path>
 
-	<ant:taskdef resource="clovertasks"/>
-    <ant:typedef resource="clovertypes"/>
+    <ant:taskdef resource="clovertasks" classpathref="clover.classpath" />
+    <ant:typedef resource="clovertypes" classpathref="clover.classpath" />
 
     <j:set var="cloverDatabase" 
         value="${maven.clover.database.dir}/clover_coverage.db"/>
 
     <j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>
 
-    <!-- Allow users to override the version of the Clover jar to use  -->
-    <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
-
     <ant:mkdir dir="${maven.clover.build.classes}"/>
     <ant:mkdir dir="${maven.clover.database.dir}"/>
     <ant:mkdir dir="${cloverReportDirectory}"/>
diff --git a/clover/project.xml b/clover/project.xml
index d0f79736..0f03c17d 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-clover-plugin</id>
   <name>Maven Clover Plugin</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Produce Clover reports</shortDescription>
   <url>http://maven.apache.org/reference/plugins/clover/</url>
@@ -104,9 +104,6 @@
       <groupId>clover</groupId>
       <artifactId>clover</artifactId>
       <version>1.2.3</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
   </dependencies>
 </project>
diff --git a/clover/xdocs/changes.xml b/clover/xdocs/changes.xml
index eda6f491..4348acf7 100644
--- a/clover/xdocs/changes.xml
+++ b/clover/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPCLOVER-15">Make maven.clover.jar work</action>
+    </release>
     <release version="1.5" date="2004-05-15">
       <action dev="vmassol" type="fix">Do not execute Clover if there are no tests to run Clover on. This prevents an error happening in the
         <code>clover:on</code>goal.
