From 6fce727aca709a9940de0f2eac419b4791c3bf9a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 08:06:58 -0400
Subject: [PATCH] Merged #194 "Register BouncyCastle as a JCE provider"

---
 build.moxie |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.moxie b/build.moxie
index c34712b..c558c52 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,19 +3,19 @@
 #
 
 # Specify minimum Moxie version required to build
-requires: 0.9.2
+requires: 0.9.3
 
 # Project Metadata
 name: Gitblit
 description: pure Java Git solution
 groupId: com.gitblit
 artifactId: gitblit
-version: 1.6.0-SNAPSHOT
+version: 1.6.1-SNAPSHOT
 inceptionYear: 2011
 
 # Current stable release
-releaseVersion: 1.5.1
-releaseDate: 2014-05-07
+releaseVersion: 1.6.0
+releaseDate: 2014-06-16
 
 # Project urls
 url: 'http://gitblit.com'
@@ -95,9 +95,10 @@
 registeredRepositories:
 - { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
 - { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
+- { id: atlassian-contrib, url: 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty' }
 
 # Source all dependencies from the following repositories in the specified order
-repositories: central, eclipse-snapshots, eclipse
+repositories: central, eclipse-snapshots, eclipse, atlassian-contrib
 
 # Convenience properties for dependencies
 properties: {
@@ -109,7 +110,7 @@
   bouncycastle.version : 1.49
   selenium.version : 2.28.0
   wikitext.version : 1.4
-  sshd.version: 0.11.0
+  sshd.version: 0.11.1-atlassian-1
   mina.version: 2.0.7
   }
 
@@ -175,6 +176,7 @@
 - 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
+- compile 'org.jsoup:jsoup:1.7.3' :war
 - test 'junit'
 # Dependencies for Selenium web page testing
 - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar

--
Gitblit v1.9.1