From ecc298bc65dbe75793e8956d89ac3d1a25dddd91 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 10:58:43 -0400
Subject: [PATCH] Merge branch 'ticket/200' into develop
---
build.moxie | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/build.moxie b/build.moxie
index cf9037a..d028200 100644
--- a/build.moxie
+++ b/build.moxie
@@ -102,10 +102,10 @@
# Convenience properties for dependencies
properties: {
- jetty.version : 9.2.1.v20140609
+ jetty.version : 9.2.3.v20140905
wicket.version : 1.4.21
- lucene.version : 4.8.1
- jgit.version : 3.4.1.201406201815-r
+ lucene.version : 4.10.0
+ jgit.version : 3.5.0.201409260305-r
groovy.version : 2.3.3
bouncycastle.version : 1.49
selenium.version : 2.28.0
@@ -176,8 +176,9 @@
- compile 'args4j:args4j:2.0.26' :war :fedclient
- 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 'ro.fortsoft.pf4j:pf4j:0.9.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