From 55c7e6ed6ab4f2002f1e8f0f20ff9ada6bd5bdd9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Jul 2014 17:41:40 -0400
Subject: [PATCH] Update to Freemarker 2.3.20
---
build.moxie | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build.moxie b/build.moxie
index d834eab..ae8eb4d 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.3
# Project Metadata
name: Gitblit
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.6.0-SNAPSHOT
+version: 1.7.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.5.1
-releaseDate: 2014-05-07
+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
+ 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
@@ -159,7 +159,7 @@
- compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
- compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
- compile 'rome:rome:0.9' :war :manager :api
-- compile 'com.google.code.gson:gson:1.7.2' :war :fedclient :manager :api
+- compile 'com.google.code.gson:gson:2.2.2' :war :fedclient :manager :api
- compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
- compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war
- compile 'org.apache.ivy:ivy:2.2.0' :war
@@ -167,7 +167,7 @@
- compile 'org.apache.commons:commons-compress:1.4.1' :war
- compile 'commons-io:commons-io:2.2' :war
- compile 'com.force.api:force-partner-api:24.0.0' :war
-- compile 'org.freemarker:freemarker:2.3.19' :war
+- compile 'org.freemarker:freemarker:2.3.20' :war
- compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
- compile 'org.kohsuke:libpam4j:1.7' :war
- compile 'args4j:args4j:2.0.26' :war :fedclient :authority
--
Gitblit v1.9.1