Check that maven-artifact-plugin >= 1.7 is installed only when needed (in the plugin:plugin goal) and not when the plugin is loaded.
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@327708 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b155674536
commit
d030546ed1
@ -214,16 +214,13 @@ Try: maven plugin:download -DgroupId=maven -DartifactId=${pluginToTest} -Dversio
|
|||||||
|
|
||||||
</define:taglib>
|
</define:taglib>
|
||||||
|
|
||||||
<j:if test="${bootstrapping == null}">
|
|
||||||
<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" prereqs="plugin:plugin" description="Build a plugin jar" />
|
||||||
<goal name="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... -->
|
<!-- For some reason a prereq on this causes an internal error... -->
|
||||||
<attainGoal name="jar:jar" />
|
<attainGoal name="jar:jar" />
|
||||||
<!-- We can't use it in the bootstrap phase because classes aren't yet build in the artifact plugin -->
|
<!-- We can't use it in the bootstrap phase because classes aren't yet build in the artifact plugin -->
|
||||||
<j:if test="${bootstrapping == null}">
|
<j:if test="${bootstrapping == null}">
|
||||||
|
<assert:assertPluginAvailable groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.7" neededBy="${plugin.artifactId}"/>
|
||||||
<artifact:rewritePOM path="${maven.build.dir}/project.xml"/>
|
<artifact:rewritePOM path="${maven.build.dir}/project.xml"/>
|
||||||
<ant:jar
|
<ant:jar
|
||||||
jarfile="${maven.build.dir}/${maven.jar.final.name}"
|
jarfile="${maven.build.dir}/${maven.jar.final.name}"
|
||||||
|
|||||||
@ -36,7 +36,7 @@
|
|||||||
<action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test directory to be changed.</action>
|
<action dev="ltheussl" type="add" issue="MPPLUGIN-33">Allow plugin-test directory to be changed.</action>
|
||||||
<action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
|
<action dev="ltheussl" type="fix" issue="MPPLUGIN-25" due-to="Jamie McCrindle, Barrie Treloar">NTLM Proxy Problem.</action>
|
||||||
<action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download didn't redownload SNAPSHOT plugins.</action>
|
<action dev="carlos" type="fix" issue="MPPLUGIN-26">plugin:download didn't redownload SNAPSHOT plugins.</action>
|
||||||
<action dev="aheritier" type="add" issue="MPPLUGIN-3">Resolve project.xml inheritance when installing plugin.</action>
|
<action dev="aheritier" type="add" issue="MPPLUGIN-3">Resolve project.xml inheritance when installing plugin. plugin:plugin goal now requires at least maven 1.1 and maven-artifact-plugin 1.7.</action>
|
||||||
<action dev="ltheussl" type="add">new plugin:validate-xml tag to validate xml documents against a schema.</action>
|
<action dev="ltheussl" type="add">new plugin:validate-xml tag to validate xml documents against a schema.</action>
|
||||||
<action dev="aheritier" type="add">new assert:assertPluginAvailable tag to check if a minimal release of a plugin is present.</action>
|
<action dev="aheritier" type="add">new assert:assertPluginAvailable tag to check if a minimal release of a plugin is present.</action>
|
||||||
</release>
|
</release>
|
||||||
|
|||||||
@ -26,8 +26,8 @@
|
|||||||
<body>
|
<body>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>
|
<goal>
|
||||||
<name>plugin</name>
|
<name>plugin:plugin</name>
|
||||||
<description>Build a plugin jar</description>
|
<description>Build a plugin jar. <b>Requires at least maven 1.1 and maven-artifact-plugin 1.7.</b></description>
|
||||||
</goal>
|
</goal>
|
||||||
<goal>
|
<goal>
|
||||||
<name>plugin:download</name>
|
<name>plugin:download</name>
|
||||||
|
|||||||
@ -46,7 +46,7 @@
|
|||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
<section name="Requirements">
|
<section name="Requirements">
|
||||||
<p>Be careful, this plugin need maven 1.1 and at least the release 1.7 of the artifact plugin.</p>
|
<p>Be careful, to create a plugin (using the goal plugin:plugin) this plugin needs maven 1.1 and at least the release 1.7 of the artifact plugin.</p>
|
||||||
</section>
|
</section>
|
||||||
</body>
|
</body>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user