Replaced uploading to GoogleCode with uploading to Bintray on release

diff --git a/build.xml b/build.xml
index beefc54b43bac2b554dfa24a6509407e461b8717..894d3e177c8242c1efd361c7cdc9870bcefa2752 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
                <property name="maven.directory" value="${basedir}/../gitblit-maven" />\r
 \r
                <!-- Download links -->\r
-               <property name="gc.url" value="http://code.google.com/p/gitblit/downloads/detail?name=" />\r
+               <property name="gc.url" value="http://dl.bintray.com/jamesmoger/generic/" />\r
        </target>\r
 \r
        \r
@@ -604,6 +604,9 @@
                                        <link name="Federation Client" src="${gc.url}fedclient-${project.releaseVersion}.zip" />\r
                                        <divider />\r
                                        <link name="API Library" src="${gc.url}gbapi-${project.releaseVersion}.zip" />\r
+                                       <divider />\r
+                                       <link name="Bintray (1.4.0+)" src="https://bintray.com/jamesmoger/generic/Gitblit" />\r
+                                       <link name="GoogleCode (pre-1.4.0)" src="https://code.google.com/p/gitblit/downloads/list?can=1" />\r
                                </menu>\r
                                \r
                                <menu name="links">\r
@@ -710,79 +713,51 @@
 \r
        <!-- \r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
-               Publish binaries to Google Code\r
+               Publish binaries to Bintray\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <target name="publishBinaries" depends="prepare" description="Publish the Gitblit binaries to Google Code">\r
+       <target name="publishBinaries" depends="prepare" description="Publish the Gitblit binaries to Bintray">\r
 \r
                <echo>Uploading Gitblit ${project.version} binaries</echo>\r
 \r
                <!-- Upload Gitblit GO Windows ZIP file -->\r
-               <mx:gcupload \r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${distribution.zipfile}" \r
-                       targetFilename="gitblit-${project.version}.zip"\r
-                       summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Windows)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${distribution.zipfile}" \r
+                       target="gitblit-${project.version}.zip" />\r
 \r
                <!-- Upload Gitblit GO Linux/Unix tar.gz file -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${distribution.tgzfile}" \r
-                       targetFilename="gitblit-${project.version}.tar.gz"\r
-                       summary="Gitblit GO v${project.version} (standalone, integrated Gitblit server for Linux/Unix)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${distribution.tgzfile}" \r
+                       target="gitblit-${project.version}.tar.gz" />\r
 \r
                <!-- Upload Gitblit WAR file -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${distribution.warfile}" \r
-                       targetFilename="gitblit-${project.version}.war"\r
-                       summary="Gitblit WAR v${project.version} (standard WAR webapp for servlet containers)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${distribution.warfile}" \r
+                       target="gitblit-${project.version}.war" />\r
 \r
                <!-- Upload Gitblit FedClient -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                   projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${fedclient.zipfile}" \r
-                       targetFilename="fedclient-${project.version}.zip"\r
-                   summary="Gitblit Federation Client v${project.version} (command-line tool to clone data from federated Gitblit instances)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${fedclient.zipfile}" \r
+                       target="fedclient-${project.version}.zip" />\r
 \r
                <!-- Upload Gitblit Manager -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${manager.zipfile}" \r
-                       targetFilename="manager-${project.version}.zip"\r
-                       summary="Gitblit Manager v${project.version} (Swing tool to remotely administer a Gitblit server)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${manager.zipfile}" \r
+                       target="manager-${project.version}.zip" />\r
 \r
                <!-- Upload Gitblit API Library -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${gbapi.zipfile}" \r
-                       targetFilename="gbapi-${project.version}.zip"\r
-                       summary="Gitblit API Library v${project.version} (JSON RPC library to integrate with your software)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${gbapi.zipfile}" \r
+                       target="gbapi-${project.version}.zip" />\r
 \r
                <!-- Upload Gitblit Express for RedHat OpenShift -->\r
-               <mx:gcupload\r
-                       username="${googlecode.user}"\r
-                       password="${googlecode.password}"\r
-                       projectname="gitblit"\r
-                       filename="${project.targetDirectory}/${express.zipfile}" \r
-                       targetFilename="express-${project.version}.zip"\r
-                       summary="Gitblit Express v${project.version} (run Gitblit on RedHat's OpenShift cloud)" />\r
+               <bintrayUpload\r
+                       source="${project.targetDirectory}/${express.zipfile}" \r
+                       target="express-${project.version}.zip" />\r
 \r
        </target>\r
 \r
-\r
+       \r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
                Publish site to site hosting service\r
@@ -1007,26 +982,20 @@
        \r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \r
-               Macro to upload binaries to GoogleCode\r
+               Macro to upload binaries to Bintray\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <macrodef name="googleUpload">\r
-               <attribute name="sourceFile"/>\r
-               <attribute name="targetFile"/>\r
-               <attribute name="description"/>\r
+       <macrodef name="bintrayUpload">\r
+               <attribute name="source"/>\r
+               <attribute name="target"/>\r
                <sequential>\r
-                       <gcupload \r
-                               username="${googlecode.user}" \r
-                               password="${googlecode.password}" \r
-                               projectname="gitblit" \r
-                               filename="${project.targetDirectory}/@{sourceFile}" \r
-                               targetfilename="@{targetFile}"\r
-                               summary="@{description}"\r
-                               labels="Featured, Type-Package, OpSys-All" />           \r
-            </sequential>\r
+                       <echo>uploading @{source} to Bintray</echo>\r
+                       <exec executable="curl">\r
+                               <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/${bintray.username}/generic/${project.name}/${project.version}/@{target}"></arg>\r
+                       </exec>\r
+               </sequential>\r
        </macrodef>\r
 \r
-\r
        <!--\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
                Install Gitblit JAR for usage as Maven module\r