From 94793ed10acf996a4b3f9f1a8538a1b997436d9f Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 05:39:31 -0400
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
build.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index a0a29fb..309becf 100644
--- a/build.xml
+++ b/build.xml
@@ -4,10 +4,12 @@
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Retrieve Moxie Toolkit
+
+ documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.1" />
- <property name="moxie.url" value="http://gitblit.github.com/moxie/maven" />
+ <property name="moxie.version" value="0.7.2" />
+ <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />
<property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />
<property name="moxie.dir" value="${user.home}/.moxie" />
@@ -992,7 +994,8 @@
<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" />
- <mx:jar destfile="${project.jar}" includeresources="true" />
+ <property name="resourceFolderPrefix" value="" />
+ <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
<exec executable="mvn">
<arg value="install:install-file" />
--
Gitblit v1.9.1