vmassol 2004/03/05 05:14:42
Modified: scratchpad/cactus2/samples/servlet maven.xml
scratchpad/cactus2/framework maven.xml
scratchpad/cactus2 maven.xml project.properties
scratchpad/cactus2/integration/maven maven.xml
Log:
Separate dist and dist-clean goals. dist-clean performs a clean before building the
project
Revision Changes Path
1.2 +2 -1 jakarta-cactus/scratchpad/cactus2/samples/servlet/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/scratchpad/cactus2/samples/servlet/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 13 Feb 2004 14:12:49 -0000 1.1
+++ maven.xml 5 Mar 2004 13:14:42 -0000 1.2
@@ -2,6 +2,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
- <goal name="dist" prereqs="clean,cactus2:test-war"/>
+ <goal name="dist" prereqs="cactus2:test-war"/>
+ <goal name="dist-clean" prereqs="clean,dist"/>
</project>
1.2 +2 -1 jakarta-cactus/scratchpad/cactus2/framework/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/scratchpad/cactus2/framework/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 13 Feb 2004 14:12:49 -0000 1.1
+++ maven.xml 5 Mar 2004 13:14:42 -0000 1.2
@@ -2,6 +2,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
- <goal name="dist" prereqs="clean,aspectwerkz:aspectc,jar:install"/>
+ <goal name="dist" prereqs="aspectwerkz:aspectc,jar:install"/>
+ <goal name="dist-clean" prereqs="clean,dist"/>
</project>
1.2 +6 -0 jakarta-cactus/scratchpad/cactus2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/scratchpad/cactus2/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Mar 2004 13:10:46 -0000 1.1
+++ maven.xml 5 Mar 2004 13:14:42 -0000 1.2
@@ -3,6 +3,12 @@
xmlns:maven="jelly:maven">
<goal name="dist">
+ <j:set var="goal" value="dist"/>
+ <attainGoal name="multiproject:goal"/>
+ </goal>
+
+ <goal name="dist-clean">
+ <j:set var="goal" value="dist-clean"/>
<attainGoal name="multiproject:goal"/>
</goal>
1.2 +1 -2 jakarta-cactus/scratchpad/cactus2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-cactus/scratchpad/cactus2/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 5 Mar 2004 13:10:46 -0000 1.1
+++ project.properties 5 Mar 2004 13:14:42 -0000 1.2
@@ -7,5 +7,4 @@
# -----------------------------------------------------------------------------
# Properties for the multiproject plugin
-goal = dist
maven.multiproject.includes=**/project.xml
1.2 +2 -1 jakarta-cactus/scratchpad/cactus2/integration/maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/scratchpad/cactus2/integration/maven/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 5 Mar 2004 13:09:40 -0000 1.1
+++ maven.xml 5 Mar 2004 13:14:42 -0000 1.2
@@ -2,6 +2,7 @@
xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
- <goal name="dist" prereqs="clean,plugin:install,plugin:deploy"/>
+ <goal name="dist" prereqs="plugin:install,plugin:deploy"/>
+ <goal name="dist-clean" prereqs="clean,dist"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
