Author: aheritier
Date: Sun Oct 2 15:02:49 2005
New Revision: 293176
URL: http://svn.apache.org/viewcvs?rev=293176&view=rev
Log:
Don't rewrite POM during bootstrap (artifact plugin isn't yet built)
Modified:
maven/maven-1/plugins/trunk/plugin/plugin.jelly
Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=293176&r1=293175&r2=293176&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Sun Oct 2 15:02:49 2005
@@ -222,14 +222,17 @@
<goal name="plugin:plugin" description="Build a plugin jar">
<!-- For some reason a prereq on this causes an internal error... -->
<attainGoal name="jar:jar" />
- <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:delete file="${maven.build.dir}/project.xml" quiet="true"/>
+ <!-- We can't use it in the bootstrap phase because classes aren't yet
build in the artifact plugin -->
+ <j:if test="${bootstrapping == null}">
+ <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:delete file="${maven.build.dir}/project.xml" quiet="true"/>
+ </j:if>
</goal>
<goal name="plugin:install" prereqs="plugin:plugin"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
