maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r405268 - in /maven/maven-1/plugins/trunk/dist: plugin.jelly xdocs/changes.xml
Date Tue, 09 May 2006 01:46:56 GMT
Author: aheritier
Date: Mon May  8 18:46:54 2006
New Revision: 405268

URL: http://svn.apache.org/viewcvs?rev=405268&view=rev
Log:
Fix compatibility with the version of ant plugin newer or equal to 1.10.

Modified:
    maven/maven-1/plugins/trunk/dist/plugin.jelly
    maven/maven-1/plugins/trunk/dist/xdocs/changes.xml

Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=405268&r1=405267&r2=405268&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Mon May  8 18:46:54 2006
@@ -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 -->

Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=405268&r1=405267&r2=405268&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Mon May  8 18:46:54 2006
@@ -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>



Mime
View raw message