You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ah...@apache.org on 2005/09/15 17:42:38 UTC
svn commit: r289263 - in /maven/maven-1/plugins/trunk: dist/ dist/xdocs/
faq/xdocs/ jar/ jar/xdocs/ jdiff/ jdiff/xdocs/ plugin/
Author: aheritier
Date: Thu Sep 15 08:42:06 2005
New Revision: 289263
URL: http://svn.apache.org/viewcvs?rev=289263&view=rev
Log:
use plugin:available instead of the old jelly script (bugged)
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/project.xml
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
maven/maven-1/plugins/trunk/dist/xdocs/index.xml
maven/maven-1/plugins/trunk/faq/xdocs/changes.xml
maven/maven-1/plugins/trunk/faq/xdocs/index.xml
maven/maven-1/plugins/trunk/jar/plugin.jelly
maven/maven-1/plugins/trunk/jar/project.xml
maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
maven/maven-1/plugins/trunk/jar/xdocs/index.xml
maven/maven-1/plugins/trunk/jdiff/plugin.jelly
maven/maven-1/plugins/trunk/jdiff/project.xml
maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
maven/maven-1/plugins/trunk/jdiff/xdocs/index.xml
maven/maven-1/plugins/trunk/plugin/plugin.jelly
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/plugin.jelly?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
@@ -23,15 +23,11 @@
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:artifact="artifact"
+ xmlns:plugin="plugin"
xmlns:util="jelly:util">
- <!-- 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 dist plugin.
- Try: maven plugin:download -DgroupId=maven -DartifactId=maven-artifact-plugin -Dversion=1.3
- </ant:fail>
+ <j:if test="${bootstrapping == null}">
+ <plugin:available groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="maven-dist-plugin"/>
</j:if>
<j:new var="distTypeHandler" className="org.apache.maven.dist.DistributionArtifactTypeHandler" />
Modified: maven/maven-1/plugins/trunk/dist/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/project.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/project.xml (original)
+++ maven/maven-1/plugins/trunk/dist/project.xml Thu Sep 15 08:42:06 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.
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Thu Sep 15 08:42:06 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.
@@ -21,10 +21,12 @@
<document>
<properties>
<title>Changes</title>
- <author email="vmassol@octo.com">Vincent Massol</author>
+ <author email="vmassol@pivolis.com">Vincent Massol</author>
</properties>
<body>
- <release version="1.7-SNAPSHOT" date="in CVS">
+ <release version="1.7-SNAPSHOT" date="in SVN">
+ <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
+ <action dev="aheritier" type="update">It requires at least maven-artifact-plugin v1.3.</action>
<action dev="akarasulu" date="2005-02-07" type="add">Added multiproject analogs mirroring single project goals. Also added the abiltiy to generate combined javadocs for multiproject distribution. However multiproject consolidation might be best put into the site plugin. These fixes are associated with the following <a href="http://jira.codehaus.org/browse/MPDIST-20">JIRA enhancement issue</a>.</action>
<action dev="vmassol" type="delete">Removed unused properties: <code>maven.dist.tar.executable</code> and <code>maven.dist.gunzip.executable</code>.</action>
<action dev="brett" type="update">Make compatible with Maven 1.1</action>
Modified: maven/maven-1/plugins/trunk/dist/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/dist/xdocs/index.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/index.xml Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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,6 +30,13 @@
This plugin produces consistent distributions that can be used
for releases and snapshots.
</p>
+ </section>
+ <section name="Requirements">
+ <p>Be careful, the following plugins must be installed to use the distribution plugin :</p>
+ <ul>
+ <li>maven-plugin-plugin 1.7 (at least)</li>
+ <li>maven-artifact-plugin 1.3 (at least)</li>
+ </ul>
</section>
</body>
</document>
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=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/changes.xml Thu Sep 15 08:42:06 2005
@@ -23,13 +23,15 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
</release>
<release version="1.5" date="2005-09-05">
+ <action dev="aheritier" type="update">It requires at least maven-xdoc-plugin v1.9.2.</action>
<action dev="aheritier" type="add" issue="MPFAQ-19" due-to="Lukas Theussl">Optional toplinks and layout fix.</action>
<action dev="aheritier" type="fix" issue="MPFAQ-16" due-to="Lukas Theussl">FAQ plugin does not produce valid XHTML 1.0 Transitional.</action>
<action dev="aheritier" type="add" issue="MPFAQ-15" due-to="Lukas Theussl">Adding a "top" link beside each answer.</action>
<action dev="dion" type="update" issue="MPFAQ-14" due-to="florent ramiere">Document .fml extension requirement</action>
- <action dev="aheritier" type="fix" issue="MPFAQ-11" due-to="Lukas Theussl">Questions' font is same size or smaller than answers' one. Xdoc plugin < 1.9.2 required.</action>
+ <action dev="aheritier" type="fix" issue="MPFAQ-11" due-to="Lukas Theussl">Questions' font is same size or smaller than answers' one.</action>
<action dev="aheritier" type="fix">The question is like a link because the anchor shouldn't enclose the question.</action>
</release>
<release version="1.4" date="2004-06-25">
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=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/faq/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/faq/xdocs/index.xml Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
Modified: maven/maven-1/plugins/trunk/jar/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/plugin.jelly?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jar/plugin.jelly Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
@@ -24,18 +24,12 @@
xmlns:license="license"
xmlns:maven="jelly:maven"
xmlns:artifact="artifact"
+ xmlns:plugin="plugin"
xmlns:util="jelly:util"
xmlns:doc="doc">
<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>
+ <plugin:available groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="maven-jar-plugin"/>
</j:if>
<!-- ================================================================== -->
Modified: maven/maven-1/plugins/trunk/jar/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/project.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/project.xml (original)
+++ maven/maven-1/plugins/trunk/jar/project.xml Thu Sep 15 08:42:06 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.
@@ -22,7 +22,7 @@
<pomVersion>3</pomVersion>
<id>maven-jar-plugin</id>
<name>Maven Jar Plug-in</name>
- <currentVersion>1.7</currentVersion>
+ <currentVersion>1.8-SNAPSHOT</currentVersion>
<description>Plugin for creating JAR files.</description>
<shortDescription>Create jar files</shortDescription>
<url>http://maven.apache.org/reference/plugins/jar/</url>
Modified: maven/maven-1/plugins/trunk/jar/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/xdocs/changes.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jar/xdocs/changes.xml Thu Sep 15 08:42:06 2005
@@ -24,6 +24,9 @@
<author email="dion@apache.org">dIon Gillard</author>
</properties>
<body>
+ <release version="1.8-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
+ </release>
<release version="1.7" date="2005-06-05">
<action dev="felipeal" type="fix" issue="MPJAR-42" due-to="Joseph Benavidez">Fix typo on documentation.</action>
<action dev="felipeal" type="fix" issue="MPJAR-40" due-to="Shinobu Kawai">Fix typo on documentation.</action>
Modified: maven/maven-1/plugins/trunk/jar/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jar/xdocs/index.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jar/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/jar/xdocs/index.xml Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
@@ -39,6 +39,13 @@
by this plugin, please see the <a href="properties.html">properties</a>
document.
</p>
+ </section>
+ <section name="Requirements">
+ <p>Be careful, the following plugins must be installed to use the jar plugin :</p>
+ <ul>
+ <li>maven-plugin-plugin 1.7 (at least)</li>
+ <li>maven-artifact-plugin 1.3 (at least)</li>
+ </ul>
</section>
</body>
</document>
Modified: maven/maven-1/plugins/trunk/jdiff/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/plugin.jelly?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/jdiff/plugin.jelly Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
@@ -23,19 +23,11 @@
xmlns:maven="jelly:maven"
xmlns:doc="doc"
xmlns:scm="scm"
+ xmlns:plugin="plugin"
xmlns:ant="jelly:ant">
<j:if test="${bootstrapping == null}">
- <!-- Poor mans version check - plugin dependencies still suck for multiple versions -->
- <maven:get plugin="maven-scm-plugin" property="plugin" var="scmPlugin" />
- <j:if test="${empty(scmPlugin) or scmPlugin.currentVersion.compareTo('1.5') lt 0}">
- <ant:fail>
- Must have SCM plugin v1.5 installed to use this version of the jdiff plugin.
- Try: maven plugin:download -DgroupId=maven -DartifactId=maven-scm-plugin -Dversion=1.5
- You can find the latest version of the SCM plugin on the Maven Download page at
- http://maven.apache.org/start/download.html
- </ant:fail>
- </j:if>
+ <plugin:available groupId="maven" artifactId="maven-scm-plugin" minRelease="1.5" neededBy="maven-jdiff-plugin"/>
</j:if>
<goal name="maven-jdiff-plugin:register">
Modified: maven/maven-1/plugins/trunk/jdiff/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/project.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/project.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/project.xml Thu Sep 15 08:42:06 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.
@@ -22,7 +22,7 @@
<pomVersion>3</pomVersion>
<id>maven-jdiff-plugin</id>
<name>Maven JDiff Plugin</name>
- <currentVersion>1.5</currentVersion>
+ <currentVersion>1.6-SNAPSHOT</currentVersion>
<description>Plugin for JDiff - reports on the differences in the public API of two releases by comparing the sources of two SCM checkouts.</description>
<url>http://maven.apache.org/reference/plugins/jdiff/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPJDIFF</issueTrackingUrl>
Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/changes.xml Thu Sep 15 08:42:06 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.
@@ -24,6 +24,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.6-SNAPSHOT" date="In SVN">
+ <action dev="aheritier" type="update">It requires at least maven-plugin-plugin v1.7.</action>
+ </release>
<release version="1.5" date="2005-09-06">
<action dev="brett" type="fix" issue="MPJDIFF-2">Add the classpath to the Javadoc tag to properly resolve classes</action>
<action dev="brett" type="update" issue="MPJDIFF-4">Store difference XML files in the
Modified: maven/maven-1/plugins/trunk/jdiff/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/jdiff/xdocs/index.xml?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/jdiff/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/jdiff/xdocs/index.xml Thu Sep 15 08:42:06 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.
@@ -49,6 +49,13 @@
</tr>
</table>
</subsection>
+ </section>
+ <section name="Requirements">
+ <p>Be careful, the following plugins must be installed to use the jdiff plugin :</p>
+ <ul>
+ <li>maven-plugin-plugin 1.7 (at least)</li>
+ <li>maven-scm-plugin 1.5 (at least)</li>
+ </ul>
</section>
</body>
</document>
Modified: maven/maven-1/plugins/trunk/plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/plugin/plugin.jelly?rev=289263&r1=289262&r2=289263&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/plugin/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/plugin/plugin.jelly Thu Sep 15 08:42:06 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org