Author: aheritier
Date: Thu Sep 15 06:53:08 2005
New Revision: 289234
URL: http://svn.apache.org/viewcvs?rev=289234&view=rev
Log:
use the new plugin:available tag which is compatible with maven 1.0
Modified:
maven/maven-1/plugins/trunk/faq/plugin.jelly
maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
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=289234&r1=289233&r2=289234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/faq/plugin.jelly Thu Sep 15 06:53:08 2005
@@ -2,7 +2,7 @@
<!--
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
xmlns:faq="faq">
<j:if test="${bootstrapping == null}">
- <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>
+ <!-- fake test because the plugin:available tag is avalaible in the
maven-plugin-plugin 1.7 and newer. Thus maven will break if it's not present.
-->
+ <plugin:available groupId="maven" artifactId="maven-plugin-plugin"
minRelease="1.7" neededBy="maven-faq-plugin"/>
+ <plugin:available groupId="maven" artifactId="maven-xdoc-plugin"
minRelease="1.9.2" neededBy="maven-faq-plugin"/>
</j:if>
<define:taglib uri="faq">
Modified: maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/faq/xdocs/changes.xml?rev=289234&r1=289233&r2=289234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Thu Sep 15 06:53:08 2005
@@ -22,7 +22,7 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
- <release version="1.6-SNAPSHOT" date="In SVN" description="FAQ plugin
compatible with maven 1.1 only">
+ <release version="1.6-SNAPSHOT" date="In SVN">
</release>
<release version="1.5" date="2005-09-05">
<action dev="aheritier" type="add" issue="MPFAQ-19" due-to="Lukas
Theussl">Optional toplinks and layout fix.</action>
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=289234&r1=289233&r2=289234&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/index.xml Thu Sep 15 06:53:08 2005
@@ -67,8 +67,7 @@
</source>
</section>
<section name="Requirements">
- <p>Maven 1.1 is required.</p>
- <p>Also be careful, the following plugins must be installed to use the
FAQ plugin :</p>
+ <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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
