From 358545f197419e0cf0ee54934aba859370ee0246 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 26 Apr 2013 10:30:43 -0400
Subject: [PATCH] Update to Moxie 0.7.3
---
build.xml | 11 ++++++-----
build.moxie | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.moxie b/build.moxie
index 503ff5f..34a0690 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,7 +3,7 @@
#
# Specify minimum Moxie version required to build
-requires: 0.7.2
+requires: 0.7.3
# Project Metadata
name: Gitblit
diff --git a/build.xml b/build.xml
index f688a6e..41993a4 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
documentation @ http://gitblit.github.io/moxie
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
- <property name="moxie.version" value="0.7.2" />
+ <property name="moxie.version" value="0.7.3" />
<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" />
@@ -36,8 +36,9 @@
<target name="prepare">
<!-- Setup Ant build from build.moxie and resolve dependencies.
- if it exists, build.properties is automatically loaded -->
- <mx:init verbose="no" />
+ If it exists, build.properties is automatically loaded.
+ Explicitly set mxroot allowing CI servers to override the default. -->
+ <mx:init verbose="no" mxroot="${moxie.dir}" />
<!-- Set Ant project properties -->
<property name="distribution.zipfile" value="gitblit-${project.version}.zip" />
@@ -994,8 +995,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" />
- <property name="resourceFolderPrefix" value="" />
- <mx:jar destfile="${project.jar}" includeresources="true" resourceFolderPrefix="${resourceFolderPrefix}" />
+ <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