From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Jun 2014 13:44:18 +0000 (-0400)
Subject: Merge branch 'pr-201' into develop
X-Git-Tag: v1.7.0~1^2~226
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2bbba7b54aa3f9a90b7e399472a9213062ce85aa;p=gitblit.git

Merge branch 'pr-201' into develop
---

2bbba7b54aa3f9a90b7e399472a9213062ce85aa
diff --cc build.moxie
index f84ab130,d2ff8de5..bb92fc07
--- a/build.moxie
+++ b/build.moxie
@@@ -101,10 -101,10 +101,10 @@@ repositories: central, eclipse-snapshot
  
  # 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
 -  lucene.version : 4.8.1
 -  jgit.version   : 3.3.1.201403241930-r
++  lucene.version :  4.8.1
 +  jgit.version   : 3.4.0.201406110918-r
    groovy.version : 1.8.8
    bouncycastle.version : 1.49
    selenium.version : 2.28.0