From ea06fea40e8bde99b18a7807e98f8a10802b5c33 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 25 Jun 2004 16:52:18 +0000
Subject: [PATCH] fix bootstrap

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115540 13f79535-47bb-0310-9956-ffa450edef68
---
 jar/plugin.jelly    | 34 ++++++++++++++++++----------------
 plugin/plugin.jelly | 34 ++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index e2ab03f6..ac0795dd 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -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>
 
   <!-- ================================================================== -->
diff --git a/plugin/plugin.jelly b/plugin/plugin.jelly
index d69ca4e3..d8d81bfb 100644
--- a/plugin/plugin.jelly
+++ b/plugin/plugin.jelly
@@ -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"