From 60abcae4639f74147776765f1c1cd97008f8cfd1 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 2 Oct 2005 01:03:29 +0000
Subject: [PATCH] Use the artifact plugin to resolve project.xml inheritance
 when installing plugin. Must be fixed : override properties aren't used.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@293049 13f79535-47bb-0310-9956-ffa450edef68
---
 plugin/plugin.jelly    | 7 ++++---
 plugin/xdocs/index.xml | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index eaa214d8..f4dbbb48 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -215,20 +215,21 @@ Try: maven plugin:download -DgroupId=maven -DartifactId=${pluginToTest} -Dversio
   </define:taglib>
   
   <j:if test="${bootstrapping == null}">
-    <assert:assertPluginAvailable groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="${plugin.artifactId}"/>
+    <assert:assertPluginAvailable groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.7" neededBy="${plugin.artifactId}"/>
   </j:if>
 
   <goal name="plugin" prereqs="plugin:plugin" description="Build a plugin jar" />
   <goal name="plugin:plugin" description="Build a plugin jar">
     <!-- For some reason a prereq on this causes an internal error... -->
     <attainGoal name="jar:jar" />
-    <j:file name="${maven.build.dir}/project.xml" escapeText="false" outputMode="xml">${pom.projectAsString}</j:file>
+    <artifact:rewritePOM path="${maven.build.dir}/project.xml"/>
     <ant:jar
       jarfile="${maven.build.dir}/${maven.jar.final.name}"
       basedir="${maven.build.dir}"
       update="true">       
       <ant:setProperty name="includes" value="project.xml" />
-    </ant:jar>    
+    </ant:jar>
+    <ant:delete file="${maven.build.dir}/project.xml" quiet="true"/>
   </goal>
 
   <goal name="plugin:install" prereqs="plugin:plugin"
diff --git a/plugin/xdocs/index.xml b/plugin/xdocs/index.xml
index c1d64d1b..9dc50343 100644
--- a/plugin/xdocs/index.xml
+++ b/plugin/xdocs/index.xml
@@ -45,5 +45,8 @@
         document.
       </p>
     </section>
+    <section name="Requirements">
+      <p>Be careful, this plugin need maven 1.1 and at least the release 1.7 of the artifact plugin.</p>
+    </section>
  </body>
 </document>