Bommels05/maven-plugins
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compatibility with the version of ant plugin newer or equal to 1.10.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@405268 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier committed 2006-05-09 01:46:54 +00:00
1 parent cc6a618b1a
commit 989d7e21a9
2 files changed
+13 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dist/plugin.jelly
Vendored
+11 -3
View File
@@ -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 -->
dist/xdocs/changes.xml
Vendored
+2 -7
View File
@@ -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>