From 46bfccb0d57ba75d195be7afa54e37ba0d4321d1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 12 Jun 2014 18:52:41 -0400
Subject: [PATCH] Fix cloning repositories with + in their names
---
build.xml | 100 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 69 insertions(+), 31 deletions(-)
diff --git a/build.xml b/build.xml
index 894d3e1..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>
@@ -561,19 +561,25 @@
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
</menu>
<divider />
- <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
- <page name="git client setup" src="setup_client.mkd" />
- <page name="eclipse plugin" src="eclipse_plugin.mkd" />
+ <menu name="Client Usage" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="using HTTP/HTTPS" src="setup_transport_http.mkd" />
+ <page name="using SSH" src="setup_transport_ssh.mkd" />
+ <page name="using the Eclipse plugin" src="eclipse_plugin.mkd" />
</menu>
<divider />
- <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
- <page name="overview" src="tickets_overview.mkd" />
- <page name="using" src="tickets_using.mkd" />
- <page name="barnum" src="tickets_barnum.mkd" />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
<page name="setup" src="tickets_setup.mkd" />
- <page name="replication & advanced administration" src="tickets_replication.mkd" />
- </menu>
- <divider />
+ <page name="replication & advanced administration" src="tickets_replication.mkd" />
+ </menu>
+ <divider />
+ <menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="plugins_overview.mkd" />
+ <page name="extension points" src="plugins_extensions.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -605,15 +611,16 @@
<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" />
+ <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />
<divider />
- <link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+ <link name="Plugin Registry" src="http://plugins.gitblit.com" />
<divider />
<link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
@@ -875,19 +882,25 @@
<page name="Gitblit as a viewer" src="setup_viewer.mkd" />
</menu>
<divider />
- <menu name="Client Configuration" pager="true" pagerPlacement="bottom" pagerLayout="justified">
- <page name="git client setup" src="setup_client.mkd" />
- <page name="eclipse plugin" src="eclipse_plugin.mkd" />
+ <menu name="Client Usage" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="using HTTP/HTTPS" src="setup_transport_http.mkd" />
+ <page name="using SSH" src="setup_transport_ssh.mkd" />
+ <page name="using the Eclipse plugin" src="eclipse_plugin.mkd" />
</menu>
<divider />
- <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
- <page name="overview" src="tickets_overview.mkd" />
- <page name="using" src="tickets_using.mkd" />
- <page name="barnum" src="tickets_barnum.mkd" />
- <page name="setup" src="tickets_setup.mkd" />
+ <menu name="Tickets" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="tickets_overview.mkd" />
+ <page name="using" src="tickets_using.mkd" />
+ <page name="barnum" src="tickets_barnum.mkd" />
+ <page name="setup" src="tickets_setup.mkd" />
<page name="replication & advanced administration" src="tickets_replication.mkd" />
- </menu>
- <divider />
+ </menu>
+ <divider />
+ <menu name="Plugins" pager="true" pagerPlacement="bottom" pagerLayout="justified">
+ <page name="overview" src="plugins_overview.mkd" />
+ <page name="extension points" src="plugins_extensions.mkd" />
+ </menu>
+ <divider />
<page name="federation" src="federation.mkd" />
<divider />
<page name="settings" src="properties.mkd" />
@@ -901,8 +914,9 @@
<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 />
<link name="Github" src="${project.scmUrl}" />
<link name="Issues" src="${project.issuesUrl}" />
@@ -991,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>
@@ -1003,13 +1017,23 @@
-->
<target name="installMaven" depends="compile" description="Install Gitblit JAR as Maven module">
<local name="project.jar" />
- <property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
+ <property name="project.jar" value="${project.outputDirectory}/${project.artifactId}.jar" />
<property name="resourceFolderPrefix" value="" />
- <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+ <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+ <!-- Install Binary jar -->
<exec executable="mvn">
<arg value="install:install-file" />
<arg value="-Dfile=${project.jar}" />
+ <arg value="-DpomFile=${basedir}/pom.xml" />
+ <arg value="-DcreateChecksum=true" />
+ </exec>
+
+ <!-- Install Sources jar -->
+ <exec executable="mvn">
+ <arg value="install:install-file" />
+ <arg value="-Dfile=${project.outputDirectory}/${project.artifactId}-sources.jar" />
+ <arg value="-Dclassifier=sources" />
<arg value="-DpomFile=${basedir}/pom.xml" />
<arg value="-DcreateChecksum=true" />
</exec>
@@ -1027,7 +1051,7 @@
<target name="uploadMaven" depends="compile" description="Upload Gitblit JAR to remote Maven repository">
<local name="project.jar" />
<property name="project.jar" value="${project.outputDirectory}/gitblit.jar" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" />
<exec executable="mvn">
<arg value="deploy:deploy-file" />
@@ -1038,5 +1062,19 @@
<arg value="-DcreateChecksum=true" />
</exec>
</target>
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Install Gitblit JAR for usage as Moxie artifact
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+ <target name="installMoxie" depends="compile" description="Install Gitblit JAR as a Moxie artifact">
+ <local name="project.jar" />
+ <property name="project.jar" value="${project.targetDirectory}/${project.artifactId}-${project.version}.jar" />
+ <property name="resourceFolderPrefix" value="" />
+ <mx:jar destfile="${project.jar}" packageSources="true" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+
+ <mx:install />
+ </target>
</project>
--
Gitblit v1.9.1