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
This commit is contained in:
1 parent
b793ed192e
commit
500d207d83
2 files changed
+11
-10
No files matched your search
+4
-10
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
Reference in new issue
Block a user