From d69d73e5da5a12f279d5c0c38c871801739f33d6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 13:31:56 -0400
Subject: [PATCH] Switch to -u from deprecated --set-upstream

---
 build.moxie |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/build.moxie b/build.moxie
index 6d80c50..b676917 100644
--- a/build.moxie
+++ b/build.moxie
@@ -133,7 +133,7 @@
 - compile 'log4j:log4j:1.2.17' :war :fedclient :authority
 - compile 'org.slf4j:slf4j-api:1.7.5' :war :fedclient :authority
 - compile 'org.slf4j:slf4j-log4j12:1.7.5' :war :fedclient :authority
-- compile 'javax.mail:mail:1.4.3' :war :authority
+- compile 'com.sun.mail:javax.mail:1.5.1' :war :authority
 - compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
 - compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
 - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
@@ -174,6 +174,7 @@
 - compile 'commons-codec:commons-codec:1.7' :war
 - compile 'redis.clients:jedis:2.3.1' :war
 - compile 'ro.fortsoft.pf4j:pf4j:0.8.0' :war
+- compile 'org.apache.tika:tika-core:1.5' :war
 - test 'junit'
 # Dependencies for Selenium web page testing
 - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar

--
Gitblit v1.9.1