Author: aheritier
Date: Sat Oct 1 18:03:29 2005
New Revision: 293049
URL: http://svn.apache.org/viewcvs?rev=293049&view=rev
Log:
Use the artifact plugin to resolve project.xml inheritance when installing
plugin.
Must be fixed : override properties aren't used.
Modified:
maven/maven-1/plugins/trunk/plugin/plugin.jelly
maven/maven-1/plugins/trunk/plugin/xdocs/index.xml
Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=293049&r1=293048&r2=293049&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Sat Oct 1 18:03:29 2005
@@ -215,20 +215,21 @@
</define:taglib>
<j:if test="${bootstrapping == null}">
- <assert:assertPluginAvailable groupId="maven"
artifactId="maven-artifact-plugin" minRelease="1.3"
neededBy="${plugin.artifactId}"/>
+ <assert:assertPluginAvailable groupId="maven"
artifactId="maven-artifact-plugin" minRelease="1.7"
neededBy="${plugin.artifactId}"/>
</j:if>
<goal name="plugin" prereqs="plugin:plugin" description="Build a plugin jar"
/>
<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>
+ <artifact:rewritePOM path="${maven.build.dir}/project.xml"/>
<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>
+ </ant:jar>
+ <ant:delete file="${maven.build.dir}/project.xml" quiet="true"/>
</goal>
<goal name="plugin:install" prereqs="plugin:plugin"
Modified: maven/maven-1/plugins/trunk/plugin/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/index.xml?rev=293049&r1=293048&r2=293049&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/index.xml Sat Oct 1 18:03:29 2005
@@ -45,5 +45,8 @@
document.
</p>
</section>
+ <section name="Requirements">
+ <p>Be careful, this plugin need maven 1.1 and at least the release 1.7
of the artifact plugin.</p>
+ </section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
