Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use plugin:available instead of the old jelly script (bugged)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@289263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-09-15 15:42:06 +00:00
parent 8dee78ca7a
commit 077f1fcf7b
15 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/plugin.jelly vendored
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,15 +23,11 @@
xmlns:ant="jelly:ant" xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven" xmlns:maven="jelly:maven"
xmlns:artifact="artifact" xmlns:artifact="artifact"
xmlns:plugin="plugin"
xmlns:util="jelly:util"> xmlns:util="jelly:util">
<!-- Poor mans version check - plugin dependencies still suck for multiple versions --> <j:if test="${bootstrapping == null}">
<maven:get plugin="maven-artifact-plugin" property="plugin" var="artifactPlugin" /> <plugin:available groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="maven-dist-plugin"/>
<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> </j:if>
<j:new var="distTypeHandler" className="org.apache.maven.dist.DistributionArtifactTypeHandler" /> <j:new var="distTypeHandler" className="org.apache.maven.dist.DistributionArtifactTypeHandler" />

2
dist/project.xml vendored
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

8
dist/xdocs/changes.xml vendored
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,10 +21,12 @@
<document> <document>
<properties> <properties>
<title>Changes</title> <title>Changes</title>
<author email="vmassol@octo.com">Vincent Massol</author> <author email="vmassol@pivolis.com">Vincent Massol</author>
</properties> </properties>
<body> <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="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="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> <action dev="brett" type="update">Make compatible with Maven 1.1</action>

9
dist/xdocs/index.xml vendored
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -31,5 +31,12 @@
for releases and snapshots. for releases and snapshots.
</p> </p>
</section> </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> </body>
</document> </document>

4
faq/xdocs/changes.xml
View File

@ -23,13 +23,15 @@
</properties> </properties>
<body> <body>
<release version="1.6-SNAPSHOT" date="In SVN"> <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>
<release version="1.5" date="2005-09-05"> <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="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="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="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="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 &lt; 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> <action dev="aheritier" type="fix">The question is like a link because the anchor shouldn't enclose the question.</action>
</release> </release>
<release version="1.4" date="2004-06-25"> <release version="1.4" date="2004-06-25">

2
faq/xdocs/index.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

12
jar/plugin.jelly
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -24,18 +24,12 @@
xmlns:license="license" xmlns:license="license"
xmlns:maven="jelly:maven" xmlns:maven="jelly:maven"
xmlns:artifact="artifact" xmlns:artifact="artifact"
xmlns:plugin="plugin"
xmlns:util="jelly:util" xmlns:util="jelly:util"
xmlns:doc="doc"> xmlns:doc="doc">
<j:if test="${bootstrapping == null}"> <j:if test="${bootstrapping == null}">
<!-- Poor mans version check - plugin dependencies still suck for multiple versions --> <plugin:available groupId="maven" artifactId="maven-artifact-plugin" minRelease="1.3" neededBy="maven-jar-plugin"/>
<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>
</j:if> </j:if>
<!-- ================================================================== --> <!-- ================================================================== -->

4
jar/project.xml
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-jar-plugin</id> <id>maven-jar-plugin</id>
<name>Maven Jar Plug-in</name> <name>Maven Jar Plug-in</name>
<currentVersion>1.7</currentVersion> <currentVersion>1.8-SNAPSHOT</currentVersion>
<description>Plugin for creating JAR files.</description> <description>Plugin for creating JAR files.</description>
<shortDescription>Create jar files</shortDescription> <shortDescription>Create jar files</shortDescription>
<url>http://maven.apache.org/reference/plugins/jar/</url> <url>http://maven.apache.org/reference/plugins/jar/</url>

3
jar/xdocs/changes.xml
View File

@ -24,6 +24,9 @@
<author email="dion@apache.org">dIon Gillard</author> <author email="dion@apache.org">dIon Gillard</author>
</properties> </properties>
<body> <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"> <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-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> <action dev="felipeal" type="fix" issue="MPJAR-40" due-to="Shinobu Kawai">Fix typo on documentation.</action>

9
jar/xdocs/index.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -40,5 +40,12 @@
document. document.
</p> </p>
</section> </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> </body>
</document> </document>

14
jdiff/plugin.jelly
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,19 +23,11 @@
xmlns:maven="jelly:maven" xmlns:maven="jelly:maven"
xmlns:doc="doc" xmlns:doc="doc"
xmlns:scm="scm" xmlns:scm="scm"
xmlns:plugin="plugin"
xmlns:ant="jelly:ant"> xmlns:ant="jelly:ant">
<j:if test="${bootstrapping == null}"> <j:if test="${bootstrapping == null}">
<!-- Poor mans version check - plugin dependencies still suck for multiple versions --> <plugin:available groupId="maven" artifactId="maven-scm-plugin" minRelease="1.5" neededBy="maven-jdiff-plugin"/>
<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>
</j:if> </j:if>
<goal name="maven-jdiff-plugin:register"> <goal name="maven-jdiff-plugin:register">

4
jdiff/project.xml
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-jdiff-plugin</id> <id>maven-jdiff-plugin</id>
<name>Maven JDiff Plugin</name> <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> <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> <url>http://maven.apache.org/reference/plugins/jdiff/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPJDIFF</issueTrackingUrl> <issueTrackingUrl>http://jira.codehaus.org/browse/MPJDIFF</issueTrackingUrl>

5
jdiff/xdocs/changes.xml
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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> <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties> </properties>
<body> <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"> <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="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 <action dev="brett" type="update" issue="MPJDIFF-4">Store difference XML files in the

9
jdiff/xdocs/index.xml
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,5 +50,12 @@
</table> </table>
</subsection> </subsection>
</section> </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> </body>
</document> </document>

2
plugin/plugin.jelly
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.