From 557a1fa25a0a1d60bdb71ea3ad0e4e9a9cd9cc61 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 17 Sep 2013 17:39:10 -0400
Subject: [PATCH] Ignore the contents of a default .git/description file
---
build.moxie | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.moxie b/build.moxie
index 9734473..4a3aa34 100644
--- a/build.moxie
+++ b/build.moxie
@@ -3,25 +3,26 @@
#
# Specify minimum Moxie version required to build
-requires: 0.7.1
+requires: 0.7.4
# Project Metadata
name: Gitblit
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.3.0-SNAPSHOT
+version: 1.4.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.2.1
-releaseDate: '2013-01-15'
+releaseVersion: 1.3.2
+releaseDate: 2013-08-22
# Project urls
url: 'http://gitblit.com'
issuesUrl: 'http://code.google.com/p/gitblit/issues/list'
socialNetworkUrl: 'https://plus.google.com/114464678392593421684'
forumUrl: 'http://groups.google.com/group/gitblit'
+mavenUrl: 'http://gitblit.github.io/gitblit-maven'
# Licenses section included for POM generation
licenses:
@@ -100,7 +101,7 @@
jetty.version : 7.6.8.v20121106
wicket.version : 1.4.21
lucene.version : 3.6.1
- jgit.version : 2.3.1.201302201838-r
+ jgit.version : 3.0.0.201306101825-r
groovy.version : 1.8.8
bouncycastle.version : 1.47
selenium.version : 2.28.0
@@ -121,7 +122,7 @@
# Standard dependencies
- compile 'com.beust:jcommander:1.17' :fedclient :authority
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
-- compile 'org.slf4j:slf4j-api:1.6.6' :war fedclient :authority
+- compile 'org.slf4j:slf4j-api:1.6.6' :war :fedclient :authority
- compile 'org.slf4j:slf4j-log4j12:1.6.6' :war :fedclient :authority
- compile 'javax.mail:mail:1.4.3' :war :fedclient :authority
- compile 'javax.servlet:javax.servlet-api:3.0.1' :fedclient
@@ -147,9 +148,12 @@
- compile 'org.apache.ivy:ivy:2.2.0' :war
- compile 'com.toedter:jcalendar:1.3.2' :authority
- compile 'org.apache.commons:commons-compress:1.4.1' :war
-# Commons Daemon is for launching services
-- provided 'commons-daemon:commons-daemon:1.0.14'
-- provided 'commons-daemon:commons-daemon:1.0.14:bin-windows:zip'
+- 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 'com.github.dblock.waffle:waffle-jna:1.5' :war
+- compile 'org.kohsuke:libpam4j:1.7' :war
+- compile 'commons-codec:commons-codec:1.7' :war
- test 'junit'
# Dependencies for Selenium web page testing
- test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar
@@ -158,4 +162,3 @@
# Dependencies with the "build" scope are retrieved
# and injected into the Ant runtime classpath
- build 'jacoco'
-
--
Gitblit v1.9.1