From 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 14:13:08 -0400
Subject: [PATCH] Merge branch 'master' into develop
---
build.xml | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index 2fd49b8..9050426 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
<property name="maven.directory" value="${basedir}/../gitblit-maven" />
<!-- Download links -->
- <property name="gc.url" value="http://dl.bintray.com/jamesmoger/generic/" />
+ <property name="gc.url" value="http://dl.bintray.com/gitblit/releases/" />
</target>
@@ -611,17 +611,14 @@
<divider />
<link name="API Library" src="${gc.url}gbapi-${project.releaseVersion}.zip" />
<divider />
- <link name="Bintray (1.4.0+)" src="https://bintray.com/jamesmoger/generic/Gitblit" />
+ <link name="Bintray (1.4.0+)" src="https://bintray.com/gitblit/releases/gitblit" />
<link name="GoogleCode (pre-1.4.0)" src="https://code.google.com/p/gitblit/downloads/list?can=1" />
<divider />
<link name="Maven Repository" src="${project.mavenUrl}" />
</menu>
<menu name="links">
- <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
- <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
- <divider />
- <link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+ <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />
<divider />
<link name="Plugin Registry" src="http://plugins.gitblit.com" />
<divider />
@@ -917,8 +914,7 @@
<page name="older releases" src="releasehistory.mkd" />
</menu>
<menu name="links">
- <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
- <link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
+ <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />
<divider />
<link name="Plugin Registry" src="http://plugins.gitblit.com" />
<divider />
@@ -1009,7 +1005,7 @@
<sequential>
<echo>uploading @{source} to Bintray</echo>
<exec executable="curl">
- <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>
+ <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/gitblit/releases/gitblit/${project.version}/@{target}"></arg>
</exec>
</sequential>
</macrodef>
--
Gitblit v1.9.1