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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build.moxie b/build.moxie
index 735e185..d028200 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,7 +3,7 @@
#
# Specify minimum Moxie version required to build
-requires: 0.9.3
+requires: 0.9.4
# Project Metadata
name: Gitblit
@@ -95,23 +95,22 @@
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' }
- { id: gitblit, url: 'http://gitblit.github.io/gitblit-maven' }
# Source all dependencies from the following repositories in the specified order
-repositories: central, eclipse-snapshots, eclipse, atlassian-contrib, gitblit
+repositories: central, eclipse-snapshots, eclipse, gitblit
# 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
wikitext.version : 1.4
- sshd.version: 0.11.1-atlassian-1
+ sshd.version: 0.12.0
mina.version: 2.0.7
guice.version : 4.0-beta4
# Gitblit maintains a fork of guice-servlet
@@ -132,7 +131,7 @@
dependencies:
- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
-- compile 'com.google.guava:guava:16.0.1' :war :fedclient
+- compile 'com.google.guava:guava:17.0' :war :fedclient
- compile 'com.intellij:annotations:12.0' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient
- compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient
@@ -177,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