From 5dae531e2ab9bd4b1fe149d9feda416d1ad48ee8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Jun 2014 09:11:19 -0400
Subject: [PATCH] Merge pull request #202 from davido/patch-6
---
build.moxie | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/build.moxie b/build.moxie
index e0e152c..f84ab13 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.7.0-SNAPSHOT
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'
@@ -101,10 +101,10 @@
# Convenience properties for dependencies
properties: {
- jetty.version : 9.1.4.v20140401
+ jetty.version : 9.2.1.v20140609
wicket.version : 1.4.21
lucene.version : 4.6.0
- jgit.version : 3.3.1.201403241930-r
+ jgit.version : 3.4.0.201406110918-r
groovy.version : 1.8.8
bouncycastle.version : 1.49
selenium.version : 2.28.0
@@ -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