From fd8cea4761b5382f23d06ed52608d1f556c4dbe5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 22 May 2014 17:31:30 -0400
Subject: [PATCH] Render GFM links using Markdown, not direct HTML

---
 build.moxie |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.moxie b/build.moxie
index 7b5aa21..d834eab 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,12 +10,12 @@
 description: pure Java Git solution
 groupId: com.gitblit
 artifactId: gitblit
-version: 1.5.0-SNAPSHOT
+version: 1.6.0-SNAPSHOT
 inceptionYear: 2011
 
 # Current stable release
-releaseVersion: 1.4.1
-releaseDate: 2014-03-18
+releaseVersion: 1.5.1
+releaseDate: 2014-05-07
 
 # 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