svn commit: r280359 - in /maven/maven-1/plugins/trunk/faq: plugin.jelly xdocs/index.xml

[ah...@apache.org]

Author: aheritier
Date: Mon Sep 12 08:51:57 2005
New Revision: 280359

URL: http://svn.apache.org/viewcvs?rev=280359&view=rev
Log:
Fix xdoc pre-requisite test. But add a pre-requisite to the plugin plugin 1.7 :-(

Modified:
    maven/maven-1/plugins/trunk/faq/plugin.jelly
    maven/maven-1/plugins/trunk/faq/xdocs/index.xml

Modified: maven/maven-1/plugins/trunk/faq/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/plugin.jelly?rev=280359&r1=280358&r2=280359&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.jelly Mon Sep 12 08:51:57 2005
@@ -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">

Modified: maven/maven-1/plugins/trunk/faq/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/index.xml?rev=280359&r1=280358&r2=280359&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/index.xml Mon Sep 12 08:51:57 2005
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org