From 9b575e8fac8d5e17e77cc284092abd856ddec8ac Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:35:29 -0400
Subject: [PATCH] Prepare 1.6.0 release

---
 build.moxie |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.moxie b/build.moxie
index 82713df..0c477e7 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,19 +3,19 @@
 #
 
 # Specify minimum Moxie version required to build
-requires: 0.9.1
+requires: 0.9.2
 
 # Project Metadata
 name: Gitblit
 description: pure Java Git solution
 groupId: com.gitblit
 artifactId: gitblit
-version: 1.5.1-SNAPSHOT
+version: 1.6.0
 inceptionYear: 2011
 
 # Current stable release
-releaseVersion: 1.5.0
-releaseDate: 2014-04-17
+releaseVersion: 1.6.0
+releaseDate: 2014-06-16
 
 # Project urls
 url: 'http://gitblit.com'
@@ -109,7 +109,7 @@
   bouncycastle.version : 1.49
   selenium.version : 2.28.0
   wikitext.version : 1.4
-  sshd.version: 0.10.1
+  sshd.version: 0.11.0
   mina.version: 2.0.7
   }
 
@@ -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