From 7f19d37fe413aecbc0749dea83128b5dcbabf515 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 13:28:10 -0400
Subject: [PATCH] Fix NPE in FileTicketService on finding all journals
---
build.moxie | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.moxie b/build.moxie
index ce3a7e2..862b4ec 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,12 +10,12 @@
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.4.0-SNAPSHOT
+version: 1.4.1-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.3.2
-releaseDate: 2013-08-22
+releaseVersion: 1.4.0
+releaseDate: 2014-03-09
# Project urls
url: 'http://gitblit.com'
@@ -104,7 +104,7 @@
jetty.version : 8.1.13.v20130916
wicket.version : 1.4.21
lucene.version : 4.6.0
- jgit.version : 3.1.0.201310021548-r
+ jgit.version : 3.3.0.201403021825-r
groovy.version : 1.8.8
bouncycastle.version : 1.49
selenium.version : 2.28.0
@@ -152,8 +152,8 @@
- compile 'org.fusesource.wikitext:tracwiki-core:${wikitext.version}' :war
- compile 'org.fusesource.wikitext:mediawiki-core:${wikitext.version}' :war
- compile 'org.fusesource.wikitext:confluence-core:${wikitext.version}' :war
-- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority
-- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority
+- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority !junit
+- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority !junit
- compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
- compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
- compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority
@@ -170,6 +170,7 @@
- compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
- compile 'org.kohsuke:libpam4j:1.7' :war
- compile 'commons-codec:commons-codec:1.7' :war
+- compile 'redis.clients:jedis:2.3.1' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
--
Gitblit v1.9.1