From 989d7e21a9832115e8cfb3a6584f2195fc93c13b Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 May 2006 01:46:54 +0000
Subject: [PATCH] Fix compatibility with the version of ant plugin newer or
 equal to 1.10.

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

diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index a3901981..dac4535a 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -108,11 +108,19 @@
       </ant:fileset>
     </ant:copy>
 
-    <maven:get var="build.xml" plugin="maven-ant-plugin" property="maven.ant.generatebuild.file"/>
-    <ant:available property="maven.dist.build.xml.avail" file="${build.xml}"/>
+    <!-- ant plugin < 1.10 -->
+    <maven:get var="antScript" plugin="maven-ant-plugin" property="maven.ant.generatebuild.file"/>
 
+    <!-- ant plugin >= 1.10 -->
+    <j:if test="${context.getVariable('antScript') == null or context.getVariable('antScript').equals('')}">
+      <maven:get var="dir" plugin="maven-ant-plugin" property="maven.ant.generate.dir"/>
+      <maven:get var="script" plugin="maven-ant-plugin" property="maven.ant.generate.script"/>
+      <j:set var="antScript" value="${dir}/${script}"/>
+    </j:if>
+
+    <ant:available property="maven.dist.build.xml.avail" file="${antScript}"/>
     <j:if test="${maven.dist.build.xml.avail}">
-      <ant:copy todir="${maven.dist.src.assembly.dir}" file="${build.xml}"/>
+      <ant:copy todir="${maven.dist.src.assembly.dir}" file="${antScript}"/>
     </j:if>
 
     <!-- Copy Source -->
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index f4565d33..7bac8e17 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -25,16 +25,11 @@
   </properties>
   <body>
     <release version="1.7-SNAPSHOT" date="in SVN">
+      <action dev="aheritier" type="update">Fix compatibility with the version of ant plugin newer or equal to 1.10.</action>
       <action dev="ltheussl" type="update" issue="MPDIST-15" due-to="Fabrizio Giustina">New <code>maven.dist.src.include</code> property.</action>
       <action dev="aheritier" type="add" issue="MPDIST-27,MPDIST-28" due-to="Phil Steitz">Allow to configure to which files should use CRLF/LF line endings in archives.</action>
       <action dev="ltheussl" type="fix" issue="MPDIST-24"><code>dist:prepare-src-filesystem</code> doesn't recognize <code>maven.ant.generatebuild.file</code>.</action>
-      <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
-        <ul>
-          <li>commons-logging v1.0.3 -> v1.0.4</li>
-          <li>maven v1.0 -> v1.0.2</li>
-          <li>maven-model v3.0.0 -> v3.0.1</li>
-        </ul>
-      </action>
+      <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : commons-logging v1.0.3 to v1.0.4, maven v1.0 to v1.0.2, maven-model v3.0.0 to v3.0.1</action>
       <action dev="aheritier" type="update">It requires at least maven-artifact-plugin v1.3.</action>
       <action dev="akarasulu" type="add">Added multiproject analogs mirroring single project goals.  Also added the abiltiy to generate combined javadocs for multiproject distribution.  However multiproject consolidation might be best put into the site plugin.  These fixes are associated with the following <a href="http://jira.codehaus.org/browse/MPDIST-20">JIRA enhancement issue</a>.</action>
       <action dev="vmassol" type="remove" issue="MPDIST-18">Removed unused properties: <code>maven.dist.tar.executable</code> and <code>maven.dist.gunzip.executable</code>.</action>