Author: ltheussl
Date: Tue Jun 13 10:10:52 2006
New Revision: 413937
URL: http://svn.apache.org/viewvc?rev=413937&view=rev
Log:
PR: MPDIST-11
<extends> dependency is resolved in dist:build-src.
It now requires artifact-plugin-1.7 (ie maven 1.1).
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/xdocs/index.xml
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=413937&r1=413936&r2=413937&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Tue Jun 13 10:10:52 2006
@@ -23,6 +23,7 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:artifact="artifact"
+ xmlns:assert="assert"
xmlns:util="jelly:util">
@@ -135,12 +136,17 @@
<ant:include name="NOTICE*"/>
<ant:include name="project.properties"/>
<ant:include name="maven.xml"/>
- <ant:include name="project.xml"/>
<j:forEach items="${includelist}" var="includeitem">
<ant:include name="${includeitem}" />
</j:forEach>
</ant:fileset>
</ant:copy>
+
+ <!-- We can't use it in the bootstrap phase because classes aren't yet
build in the artifact plugin. -->
+ <j:if test="${bootstrapping == null}">
+ <assert:assertPluginAvailable groupId="maven"
artifactId="maven-artifact-plugin" minRelease="1.7"
neededBy="${plugin.artifactId}"/>
+ <artifact:rewritePOM path="${maven.dist.src.assembly.dir}/project.xml"/>
+ </j:if>
<!-- ant plugin < 1.10 -->
<maven:get var="antScript" plugin="maven-ant-plugin"
property="maven.ant.generatebuild.file"/>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=413937&r1=413936&r2=413937&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Tue Jun 13 10:10:52 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPDIST-11">Parent project is
not included in source distribution.</action>
<action dev="ltheussl" type="add" issue="MPDIST-17">New property
maven.dist.formats to allow creation of only zip or tar.gz archives.</action>
<action dev="ltheussl" type="add" issue="MPDIST-26">Allow distribution
of artifact types other than jar. New property maven.dist.bin.artifact.type,
deprecated property maven.dist.bin.artifact.</action>
<action dev="ltheussl" type="add" issue="MPDIST-19">New property
<code>maven.dist.bin.include.site</code> to optionally include the site docs in
the binary distribution.</action>
@@ -38,7 +39,7 @@
</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 : 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="ltheussl" type="update">It requires at least
maven-artifact-plugin v1.7.</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>
<action dev="brett" type="update">Make compatible with Maven 1.1</action>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/index.xml?rev=413937&r1=413936&r2=413937&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/index.xml Tue Jun 13 10:10:52 2006
@@ -34,8 +34,9 @@
<section name="Requirements">
<p>Be careful, the following plugins must be installed to use the
distribution plugin :</p>
<ul>
- <li>maven-artifact-plugin 1.3 (at least)</li>
+ <li>maven-artifact-plugin 1.7 (at least)</li>
</ul>
+ <p>Note that this plugin is not compatible with Maven 1.0.2.</p>
</section>
</body>
</document>
