From 518f4fbddb763b6efe0229328f9156a75253444c Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 1 Oct 2005 22:28:34 +0000
Subject: [PATCH] MPPLUGIN-3 : Resolve project.xml inheritance when installing
 plugin. The project.xml is updated with the POM with all variables resolved.
 Problem : All paths are resolved. It's not really clean but these ones aren't
 used at runtime. Thus it's not blocking. I can't replace the basedir to keep
 the compability with maven 1.0.2 (jelly taglib util:replace doesn't support
 String replacement) and with jdk 1.3 (String.replaceAll() doesn't exist).

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

diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index 28a8e985..eaa214d8 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -222,6 +222,13 @@ Try: maven plugin:download -DgroupId=maven -DartifactId=${pluginToTest} -Dversio
   <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>
+    <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>    
   </goal>
 
   <goal name="plugin:install" prereqs="plugin:plugin"
diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml
index 2aa99b3a..136c1644 100644
--- a/plugin/xdocs/changes.xml
+++ b/plugin/xdocs/changes.xml
@@ -27,6 +27,7 @@
       <action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test directory to be changed.</action>
       <action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
       <action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download didn't redownload SNAPSHOT plugins.</action>
+      <action dev="aheritier" type="add" issue="MPPLUGIN-3">Resolve project.xml inheritance when installing plugin.</action>
       <action dev="ltheussl" type="add">new plugin:validate-xml tag to validate xml documents against a schema.</action>
       <action dev="aheritier" type="add">new assert:assertPluginAvailable tag to check if a minimal release of a plugin is present.</action>
     </release>