You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2005/10/23 00:19:09 UTC
svn commit: r327708 - in /maven/maven-1/plugins/trunk/plugin: plugin.jelly
xdocs/changes.xml xdocs/goals.xml xdocs/index.xml
Author: aheritier
Date: Sat Oct 22 15:19:01 2005
New Revision: 327708
URL: http://svn.apache.org/viewcvs?rev=327708&view=rev
Log:
Check that maven-artifact-plugin >= 1.7 is installed only when needed (in the plugin:plugin goal) and not when the plugin is loaded.
Modified:
maven/maven-1/plugins/trunk/plugin/plugin.jelly
maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml
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=327708&r1=327707&r2=327708&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Sat Oct 22 15:19:01 2005
@@ -214,16 +214,13 @@
</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:plugin" description="Build a plugin jar">
<!-- For some reason a prereq on this causes an internal error... -->
<attainGoal name="jar:jar" />
<!-- 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.build.dir}/project.xml"/>
<ant:jar
jarfile="${maven.build.dir}/${maven.jar.final.name}"
Modified: maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml?rev=327708&r1=327707&r2=327708&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/changes.xml Sat Oct 22 15:19:01 2005
@@ -36,7 +36,7 @@
<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="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="aheritier" type="add">new assert:assertPluginAvailable tag to check if a minimal release of a plugin is present.</action>
</release>
Modified: maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml?rev=327708&r1=327707&r2=327708&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/goals.xml Sat Oct 22 15:19:01 2005
@@ -26,8 +26,8 @@
<body>
<goals>
<goal>
- <name>plugin</name>
- <description>Build a plugin jar</description>
+ <name>plugin:plugin</name>
+ <description>Build a plugin jar. <b>Requires at least maven 1.1 and maven-artifact-plugin 1.7.</b></description>
</goal>
<goal>
<name>plugin:download</name>
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=327708&r1=327707&r2=327708&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/plugin/xdocs/index.xml Sat Oct 22 15:19:01 2005
@@ -46,7 +46,7 @@
</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>
+ <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>
</body>
</document>