Tweak release process

diff --git a/build.xml b/build.xml
index 47a84f5643d14e51104168e9c3c5122c9235e2c4..d53c8200054c2559553284facd9dee895008ec5a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -96,34 +96,6 @@
        </target>\r
 \r
 \r
-       <!--\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
-               Upload artifacts to GoogleCode and the remote Maven repository\r
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
-       -->\r
-       <target name="uploadArtifacts" depends="build">\r
-\r
-               <mx:gcupload\r
-                                username="${googlecode.user}"\r
-                                password="${googlecode.password}"\r
-                                projectname="iciql"\r
-                                filename="${project.targetDirectory}/${project.artifactId}-${project.version}.zip"\r
-                                targetfilename="${project.artifactId}-${project.version}.zip"\r
-                                summary="Version ${project.version} -- library, sources, and javadoc"\r
-                                labels="Featured, Type-Package, OpSys-All" />\r
-\r
-               <mx:ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.password}"\r
-                       remotedir="${ftp.maven.dir}" verbose="yes" depends="yes" timediffauto="true"\r
-                       preservelastmodified="true">\r
-                       <fileset dir="${basedir}/maven">\r
-                               <!-- exclude root files -->\r
-                               <exclude name="*.md" />\r
-                               <exclude name=".git*" />\r
-                       </fileset>\r
-               </mx:ftp>\r
-       </target>\r
-\r
-\r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Build the iciql website\r
@@ -183,7 +155,7 @@
 \r
                                <menu name="downloads">\r
                                        <link name="${project.artifactId}-${project.releaseVersion}"\r
-                                               src="${gc.url}${project.artifactId}-${project.releaseVersion}.jar" />\r
+                                               src="${gc.url}${project.artifactId}-${project.releaseVersion}.zip" />\r
                                        <divider />\r
                                        <link name="Maven Repository" src="${project.mavenUrl}" />\r
                                </menu>\r

diff --git a/maven b/maven
index 6884b8fde4f372d63e1cc21773ce25c3d3e3fda9..82c3f24d10f3c5fc77fb878242c6867929973415 160000 (submodule)
--- a/maven
+++ b/maven
@@ -1 +1 @@
-Subproject commit 6884b8fde4f372d63e1cc21773ce25c3d3e3fda9
+Subproject commit 82c3f24d10f3c5fc77fb878242c6867929973415

diff --git a/release.template b/release.template
index 7df43ea461fe832f8057e682b8c63eb3ae6e0c49..4195e444e1a58de1dfcf23db4deb0f3199492e67 100644 (file)
--- 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