brett 2004/06/11 19:27:13
Modified: gump plugin.jelly plugin.properties project.xml
gump/xdocs changes.xml properties.xml
Log:
PR: MPGUMP-1
Add <maven /> tag
Revision Changes Path
1.6 +14 -1 maven-plugins/gump/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/gump/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 4 Apr 2004 04:14:54 -0000 1.5
+++ plugin.jelly 12 Jun 2004 02:27:12 -0000 1.6
@@ -52,6 +52,12 @@
<goal name="gump:generate-descriptor"
description="Generate Gump descriptor from Maven descriptor">
+ <j:set var="genAnt" value="${maven.gump.ant.generate}" />
+ <j:set var="genMaven" value="${maven.gump.maven.generate}" />
+ <j:if test="${!genAnt and !genMaven}">
+ <fail>You must specify one of maven.gump.ant and maven.gump.maven</fail>
+ </j:if>
+
<j:set var="gumpProject"><gump:name project="${pom.artifactId}"/></j:set>
<j:file name="${basedir}/gump.xml" prettyPrint="true" xmlns="dummy">
<module name="${gumpProject}">
@@ -70,9 +76,16 @@
<!-- Standard Maven target to produce Javadocs, source -->
<!-- and binary distributions. -->
- <ant buildfile="build.xml" target="dist">
+<j:if test="${genAnt}">
+ <ant buildfile="build.xml" target="${maven.gump.ant.target}">
<property name="final.name" value="${pom.artifactId}-@@DATE@@"/>
</ant>
+</j:if>
+<j:if test="${genMaven}">
+ <maven goal="${maven.gump.maven.goals}">
+ <property name="final.name" value="${pom.artifactId}-@@DATE@@"/>
+ </maven>
+</j:if>
<package>${pom.package}</package>
1.3 +5 -0 maven-plugins/gump/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/gump/plugin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.properties 4 Mar 2004 18:13:38 -0000 1.2
+++ plugin.properties 12 Jun 2004 02:27:12 -0000 1.3
@@ -14,3 +14,8 @@
# limitations under the License.
# -------------------------------------------------------------------
+maven.gump.ant.generate = false
+maven.gump.maven.generate = true
+
+maven.gump.ant.target = dist
+maven.gump.maven.goals = jar
1.23 +1 -1 maven-plugins/gump/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/gump/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 16 May 2004 02:47:23 -0000 1.22
+++ project.xml 12 Jun 2004 02:27:12 -0000 1.23
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-gump-plugin</id>
<name>Maven Gump Plug-in</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<description/>
<shortDescription>produce Gump descriptor</shortDescription>
<url>http://maven.apache.org/reference/plugins/gump/</url>
1.7 +4 -0 maven-plugins/gump/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/gump/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 16 May 2004 02:47:23 -0000 1.6
+++ changes.xml 12 Jun 2004 02:27:12 -0000 1.7
@@ -24,6 +24,10 @@
<author email="[EMAIL PROTECTED]">dIon Gillard</author>
</properties>
<body>
+ <release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="add" issue="MPGUMP-1">Allow creation of <maven
descriptor element, and default to it</action>
+ <action dev="brett" type="add">Add maven.gump.ant.target and
maven.gump.maven.goal properties</action>
+ </release>
<release version="1.3" date="2004-05-15"></release>
<release version="1.2" date="2003-09-29">
<action dev="dion" type="fix">gump.xml generated into basedir</action>
1.4 +28 -0 maven-plugins/gump/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/gump/xdocs/properties.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.xml 4 Mar 2004 18:13:38 -0000 1.3
+++ properties.xml 12 Jun 2004 02:27:12 -0000 1.4
@@ -34,6 +34,34 @@
<table>
<tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
<tr>
+ <td>maven.gump.ant.generate</td>
+ <td>Yes</td>
+ <td>
+ Set to true to generate an ant element. By default, none is added to
the descriptor.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.gump.maven.generate</td>
+ <td>Yes</td>
+ <td>
+ Set to false to not generate a maven element. By default, a maven
element is added to the descriptor.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.gump.ant.target</td>
+ <td>Yes</td>
+ <td>
+ The target to execute. Defaults to dist.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.gump.maven.goals</td>
+ <td>Yes</td>
+ <td>
+ The goals to execute. Defaults to jar.
+ </td>
+ </tr>
+ <tr>
<td>pom.dependencies</td>
<td>Yes</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
