mcconnell 2003/12/26 01:24:25
Modified: merlin maven.xml project.xml
Log:
Markup for release tag.
Revision Changes Path
1.29 +7 -7 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- maven.xml 25 Dec 2003 01:12:20 -0000 1.28
+++ maven.xml 26 Dec 2003 09:24:25 -0000 1.29
@@ -177,12 +177,12 @@
<goal name="merlin:package">
- <!--
<j:set var="package.name" value="${maven.final.name}-dist"/>
- -->
+ <!--
<maven:snapshot project="${pom}"/>
<j:set var="timestamp" value="${snapshotSignature.substring(7,15)}"/>
- <j:set var="package.name" value="${maven.final.name}-dist-${timestamp}"/>
+ <j:set var="package.name" value="${maven.final.name}-${timestamp}"/>
+ -->
<ant:echo>Building distribution: ${package.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
@@ -207,8 +207,8 @@
<ant:delete file="${maven.build.dir}/${package.name}.tar"/>
<checksum file="${maven.build.dir}/${package.name}.tar.gz"/>
- <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>
- <!-- <j:set var="docs.name" value="${package.name}-docs"/>-->
+ <!-- <j:set var="docs.name" value="${maven.final.name}-docs-${timestamp}"/>-->
+ <j:set var="docs.name" value="${package.name}-docs"/>
<ant:echo>Building doc kit: ${docs.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${docs.name}.zip">
@@ -224,8 +224,8 @@
<ant:delete file="${maven.build.dir}/${docs.name}.tar"/>
<checksum file="${maven.build.dir}/${docs.name}.tar.gz"/>
- <j:set var="tutorial.name" value="${maven.final.name}-tutorial-${timestamp}"/>
- <!--<j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>-->
+ <!--<j:set var="tutorial.name"
value="${maven.final.name}-tutorial-${timestamp}"/>-->
+ <j:set var="tutorial.name" value="${maven.final.name}-tutorial"/>
<ant:echo>Building tutorial kit: ${tutorial.name}</ant:echo>
<ant:zip zipfile="${maven.build.dir}/${tutorial.name}.zip">
1.15 +5 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 25 Dec 2003 01:12:20 -0000 1.14
+++ project.xml 26 Dec 2003 09:24:25 -0000 1.15
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.2-RC</currentVersion>
+ <currentVersion>3.2</currentVersion>
<organization>
<name>Apache Software Foundation</name>
@@ -206,6 +206,10 @@
<release>
<version>3.2-20031225</version>
<tag>SNAPSHOT_20031225</tag>
+ </release>
+ <release>
+ <version>3.2</version>
+ <tag>RELEASE_3-2</tag>
</release>
</releases>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
