You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/06/25 18:52:18 UTC
cvs commit: maven-plugins/plugin plugin.jelly
brett 2004/06/25 09:52:18
Modified: jar plugin.jelly
plugin plugin.jelly
Log:
fix bootstrap
Revision Changes Path
1.39 +18 -16 maven-plugins/jar/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/jar/plugin.jelly,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- plugin.jelly 25 Jun 2004 13:52:23 -0000 1.38
+++ plugin.jelly 25 Jun 2004 16:52:18 -0000 1.39
@@ -28,22 +28,24 @@
xmlns:util="jelly:util"
xmlns:doc="doc">
- <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
- <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
- <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
- <ant:fail>
- Must have artifact plugin v1.3 installed to use this version of the jar plugin.
- Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
- </ant:fail>
- </j:if>
- <!-- Can remove deploy dependency above when this is gone -->
- <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
- <j:if test="${deployPlugin != null}">
- <ant:fail>
- Must remove the deploy plugin to use this version of the jar plugin.
- Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
- ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
- </ant:fail>
+ <j:if test="${bootstrapping == null}">
+ <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
+ <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
+ <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
+ <ant:fail>
+ Must have artifact plugin v1.3 installed to use this version of the jar plugin.
+ Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
+ </ant:fail>
+ </j:if>
+ <!-- Can remove deploy dependency above when this is gone -->
+ <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
+ <j:if test="${deployPlugin != null}">
+ <ant:fail>
+ Must remove the deploy plugin to use this version of the jar plugin.
+ Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
+ ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
+ </ant:fail>
+ </j:if>
</j:if>
<!-- ================================================================== -->
1.38 +18 -16 maven-plugins/plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/plugin/plugin.jelly,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- plugin.jelly 25 Jun 2004 13:53:28 -0000 1.37
+++ plugin.jelly 25 Jun 2004 16:52:18 -0000 1.38
@@ -29,22 +29,24 @@
xmlns:deploy="deploy"
xmlns:x="jelly:xml">
- <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
- <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
- <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
- <ant:fail>
- Must have artifact plugin v1.3 installed to use this version of the plugin plugin.
- Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
- </ant:fail>
- </j:if>
- <!-- Can remove deploy dependency above when this is gone -->
- <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
- <j:if test="${deployPlugin != null}">
- <ant:fail>
- Must remove the deploy plugin to use this version of the plugin plugin.
- Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
- ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
- </ant:fail>
+ <j:if test="${bootstrapping == null}">
+ <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
+ <maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" />
+ <j:if test="${artifactPlugin.currentVersion.compareTo('1.3') lt 0}">
+ <ant:fail>
+ Must have artifact plugin v1.3 installed to use this version of the plugin plugin.
+ Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
+ </ant:fail>
+ </j:if>
+ <!-- Can remove deploy dependency above when this is gone -->
+ <maven:get plugin="maven-deploy-plugin" property="plugin" var="deployPlugin" />
+ <j:if test="${deployPlugin != null}">
+ <ant:fail>
+ Must remove the deploy plugin to use this version of the plugin plugin.
+ Please delete ${deployPlugin.artifactId}-${deployPlugin.currentVersion}.jar from
+ ${maven.plugin.dir} and ${maven.plugin.unpacked.dir} (if it exists)
+ </ant:fail>
+ </j:if>
</j:if>
<goal name="plugin"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org