Tweak release template and push the new tag

build.xml

@@ -251,10 +251,11 @@
 		<!-- release -->
 		<property name="dryrun" value="false" />
 		<mx:version stage="release" dryrun="${dryrun}" />		
-		<!-- commit build.moxie & releases.moxie (automatic) and maven artifacts -->
+		<property name="project.tag" value="v${project.version}" />
+		<!-- commit build.moxie & releases.moxie (automatic) -->
 		<mx:commit showtitle="no">
 		    <message>Prepare ${project.version} release</message>
-			<tag name="v${project.version}">
+			<tag name="${project.tag}">
 				<message>${project.name} ${project.version} release</message>
 			</tag>
 		</mx:commit>
@@ -279,6 +280,7 @@
 			<filterset begintoken="${dollar}{" endtoken="}">
 				<filter token="project.version" value="${project.version}" />
 				<filter token="project.commitId" value="${project.commitId}" />
+				<filter token="project.tag" value="${project.tag}" />
 			</filterset>
 		</copy>
 

release.template

@@ -5,17 +5,17 @@
 
 # go back one commit to RELEASE commit
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Checking out ${project.version} RELEASE commit ${project.commitId}"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout ${project.commitId}
 
 # submodules operate on a detached HEAD so we first checkout and pull master
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Preparing Maven submodule"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 cd maven
 git checkout master
@@ -24,17 +24,17 @@ cd ..
 
 # build RELEASE artifacts, this will deploy artifacts into maven folder
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Building ${project.version} RELEASE artifacts"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 ant
 
 # commit all generated artifacts and metadata in submodule
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Committing Maven submodule ${project.version} RELEASE artifacts"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 cd  maven
 git add .
@@ -43,9 +43,9 @@ cd ..
 
 # Update master branch Maven submodule repository reference
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Updating master for Maven submodule ${project.version} RELEASE artifacts"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout master
 git add maven
@@ -53,9 +53,9 @@ git commit -m "updated Maven submodule repository to ${project.version}"
 
 # Update gh-pages branch Maven submodule repository reference
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Updating gh-pages for Maven submodule ${project.version} RELEASE artifacts"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout gh-pages
 git add maven
@@ -63,41 +63,41 @@ git commit -m "updated Maven submodule repository to ${project.version}"
 
 # return to release commit
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Checking out ${project.version} RELEASE commit ${project.commitId}"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout ${project.commitId}
 
 # upload artifacts
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Uploading ${project.version} artifacts"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 ant uploadArtifacts
 
 # build site, update gh-pages, and ftp upload site to hosting provider
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Building ${project.version} website"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 ant publishSite
 
 # return to project master
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Checking out master"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout master
 
 # push Maven submodule to origin
 echo ""
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo "Pushing Maven submodule"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 cd maven
 git push origin master
@@ -105,11 +105,11 @@ cd ..
 
 # push project branches
 echo ""
-echo "************************************************************************"
-echo "Pushing master and gh-pages"
-echo "************************************************************************"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+echo "Pushing master, gh-pages, and tag ${project.tag}"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
-git push origin master gh-pages
+git push origin master gh-pages tag ${project.tag}
 
 # update the Maven submodule reference
 git submodule update