From bdb2899da4cbb27016d85c5e4fe268ddbccef546 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 22 Oct 2014 23:10:12 -0400
Subject: [PATCH] Tweak release process

---
 build.xml        | 30 +-----------------------------
 maven            |  2 +-
 release.template | 12 +++++++++---
 3 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/build.xml b/build.xml
index 47a84f5..d53c820 100644
--- a/build.xml
+++ b/build.xml
@@ -96,34 +96,6 @@
 	</target>
 
 
-	<!--
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Upload artifacts to GoogleCode and the remote Maven repository
-		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	-->
-	<target name="uploadArtifacts" depends="build">
-
-		<mx:gcupload
-				 username="${googlecode.user}"
-				 password="${googlecode.password}"
-				 projectname="iciql"
-				 filename="${project.targetDirectory}/${project.artifactId}-${project.version}.zip"
-				 targetfilename="${project.artifactId}-${project.version}.zip"
-				 summary="Version ${project.version} -- library, sources, and javadoc"
-				 labels="Featured, Type-Package, OpSys-All" />
-
-		<mx:ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.password}"
-			remotedir="${ftp.maven.dir}" verbose="yes" depends="yes" timediffauto="true"
-			preservelastmodified="true">
-			<fileset dir="${basedir}/maven">
-				<!-- exclude root files -->
-				<exclude name="*.md" />
-				<exclude name=".git*" />
-			</fileset>
-		</mx:ftp>
-	</target>
-
-
 	<!--
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		Build the iciql website
@@ -183,7 +155,7 @@
 
 				<menu name="downloads">
 					<link name="${project.artifactId}-${project.releaseVersion}"
-						src="${gc.url}${project.artifactId}-${project.releaseVersion}.jar" />
+						src="${gc.url}${project.artifactId}-${project.releaseVersion}.zip" />
 					<divider />
 					<link name="Maven Repository" src="${project.mavenUrl}" />
 				</menu>
diff --git a/maven b/maven
index 6884b8f..82c3f24 160000
--- a/maven
+++ b/maven
@@ -1 +1 @@
-Subproject commit 6884b8fde4f372d63e1cc21773ce25c3d3e3fda9
+Subproject commit 82c3f24d10f3c5fc77fb878242c6867929973415
diff --git a/release.template b/release.template
index 7df43ea..4195e44 100644
--- a/release.template
+++ b/release.template
@@ -58,7 +58,6 @@ echo "Updating gh-pages for Maven submodule ${project.version} RELEASE artifacts
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
 git checkout gh-pages
-git pull
 git add maven
 git commit -m "updated Maven submodule repository to ${project.version}"
 
@@ -107,10 +106,17 @@ cd ..
 # push project branches
 echo ""
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-echo "Pushing master, gh-pages, and tag ${project.tag}"
+echo "Pushing gh-pages"
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+echo ""
+git push -f origin gh-pages
+
+echo ""
+echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+echo "Pushing master and tag ${project.tag}"
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo ""
-git push origin master gh-pages tag ${project.tag}
+git push origin master tag ${project.tag}
 
 # update the Maven submodule reference
 git submodule update
-- 
2.39.5