From 0a4e07c70422029b939de278fc74f9d3093ce265 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Mar 2004 22:26:11 +0000
Subject: [PATCH] PR: MPPLUGIN-12 make uninstall delete the correct plugin when
 running plugin:download

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114842 13f79535-47bb-0310-9956-ffa450edef68
---
 plugin/plugin.jelly      | 42 ++++++++++++++++++++++++----------------
 plugin/project.xml       |  2 +-
 plugin/xdocs/changes.xml |  6 ++++++
 3 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index 03594433..58294746 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -19,6 +19,7 @@
 
 
 <project
+  xmlns:plugin="plugin"
   xmlns:ant="jelly:ant"
   xmlns:j="jelly:core"
   xmlns:maven="jelly:maven"
@@ -38,9 +39,11 @@
 
   </goal>
 
-  <goal name="plugin:install" prereqs="plugin,plugin:uninstall"
+  <goal name="plugin:install" prereqs="plugin"
     description="Install the plugin jar, prepare Maven to expand it locally and clear caches">
 
+    <plugin:uninstall name="${pom.artifactId}" />
+
     <copy file="${maven.build.dir}/${maven.final.name}.jar"
       todir="${maven.home}/plugins"/>
 
@@ -48,23 +51,10 @@
 
   <goal name="plugin:uninstall" 
     description="Uninstall all versions of the plugin">
-    
-    <delete verbose="false" failonerror="false">
-      <fileset dir="${maven.home}/plugins">
-        <include name="${pom.artifactId}-*.jar" />
-      </fileset>
-    </delete>
 
-    <delete includeEmptyDirs="true" verbose="false" failonerror="false">
-      <fileset dir="${maven.plugin.unpacked.dir}">
-        <include name="*.cache"/>
-        <include name="**/.processed" />
-        <include name="${pom.artifactId}-*/**" />
-      </fileset>
-    </delete>
-    
+    <plugin:uninstall name="${pom.artifactId}" />
   </goal>
-
+    
   <goal name="plugin:deploy" prereqs="plugin"
     description="Install a specific unpacked plugin but no new jar">
 
@@ -194,7 +184,7 @@
   </goal>
   
   <goal name="plugin:download" description="download and install a plugin from a remote repo" prereqs="plugin:download-artifact">
-    <attainGoal name="plugin:uninstall"/>
+    <plugin:uninstall name="${artifactId}" />
     <u:file var="localPlugin" name="${maven.home}/plugins/${artifactId}-${version}.jar" />
     <ant:copy file="${localPluginFile}" tofile="${localPlugin}" />      
   </goal>
@@ -266,6 +256,24 @@
     />
   </goal>
 
+  <define:taglib uri="plugin">
+    <define:tag name="uninstall">
+      <ant:delete verbose="false" failonerror="false">
+        <ant:fileset dir="${maven.home}/plugins">
+          <ant:include name="${name}-*.jar" />
+        </ant:fileset>
+      </ant:delete>
+
+      <ant:delete includeEmptyDirs="true" verbose="false" failonerror="false">
+        <ant:fileset dir="${maven.plugin.unpacked.dir}">
+          <ant:include name="*.cache"/>
+          <ant:include name="**/.processed" />
+          <ant:include name="${name}-*/**" />
+        </ant:fileset>
+      </ant:delete>
+    </define:tag>
+  </define:taglib>
+    
   <define:taglib uri="assert">
     <define:tag name="assertFileExists">
       <!-- @file : Full file path -->
diff --git a/plugin/project.xml b/plugin/project.xml
index f36522f1..2fe08aaf 100644
--- a/plugin/project.xml
+++ b/plugin/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-plugin-plugin</id>
   <name>Maven Plugin Plugin</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Maven Plugin plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/plugin/</url>
diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml
index c94551f7..feb62cb4 100644
--- a/plugin/xdocs/changes.xml
+++ b/plugin/xdocs/changes.xml
@@ -24,6 +24,12 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.3-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPPLUGIN-12">
+        Don't uninstall incorrect plugins when running plugin:download
+      </action>
+    </release>
+
     <release version="1.2" date="2004-03-07">
       <action dev="epugh" type="update">Fixed the plugin:download goal to work. Previously it would delete the plugin you just downloaded. Also now leverages the plugin:uninstall goal.</action>
       <action dev="vmassol" type="add">Added assert:assertEquals tag to verify if two values are equal while testing a plugin.</action>
