From 500d207d8384358ac41570b27463d1d2ce33960b Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 12 Sep 2005 15:51:57 +0000
Subject: [PATCH] Fix xdoc pre-requisite test. But add a pre-requisite to the
 plugin plugin 1.7 :-(

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@280359 13f79535-47bb-0310-9956-ffa450edef68
---
 faq/plugin.jelly    | 14 ++++----------
 faq/xdocs/index.xml |  7 +++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index b1500d24..402c631b 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -26,19 +26,13 @@
   xmlns:ant="jelly:ant"
   xmlns:define="jelly:define"
   xmlns:doc="doc"
+  xmlns:plugin="plugin"
   xmlns:faq="faq">
 
   <j:if test="${bootstrapping == null}">
-    <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
-    <maven:get plugin="maven-xdoc-plugin" property="plugin" var="xdocPlugin" />
-    <j:if test="${empty(xdocPlugin) or xdocPlugin.currentVersion.compareTo('1.9.2') lt 0}">
-      <ant:fail>
-        Must have XDOC plugin v1.9.2 installed to use this version of the faq plugin.
-        Try: maven plugin:download -DgroupId=maven -DartifactId=maven-xdoc-plugin -Dversion=1.9.2
-        You can find the latest version of the XDOC plugin on the Maven Download page at
-        http://maven.apache.org/start/download.html
-      </ant:fail>
-    </j:if>
+    <echo>Checking if at least maven-xdoc-plugin 1.9.2 is installed</echo>
+    <plugin:available groupId="maven" artifactId="maven-xdoc-plugin" minRelease="1.9.2"/>
+    <echo>Ok.</echo>
   </j:if>
 
   <define:taglib uri="faq">
diff --git a/faq/xdocs/index.xml b/faq/xdocs/index.xml
index fa791031..78fdb1bc 100644
--- a/faq/xdocs/index.xml
+++ b/faq/xdocs/index.xml
@@ -66,5 +66,12 @@
   ]]>
       </source>
     </section>
+    <section name="Requirements">
+      <p>Be Careful, the following plugins must be installed to use the FAQ plugin :</p>
+      <ul>
+        <li>maven-plugin-plugin 1.7 (at least)</li>
+        <li>maven-xdoc-plugin 1.9.2 (at least)</li>
+      </ul>
+    </section>
  </body>
 </document>