From b32fa68832412374a1a905525a4e395d35b4d1ae Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 20 Apr 2016 10:06:09 -0400 Subject: [PATCH] Use getInteger not getFilesize, fixes #1049 --- build.moxie | 54 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/build.moxie b/build.moxie index 965ecde..8eb2bbf 100644 --- a/build.moxie +++ b/build.moxie @@ -10,16 +10,16 @@ description: pure Java Git solution groupId: com.gitblit artifactId: gitblit -version: 1.7.0-SNAPSHOT +version: 1.7.2-SNAPSHOT inceptionYear: 2011 # Current stable release -releaseVersion: 1.6.0 -releaseDate: 2014-06-16 +releaseVersion: 1.7.1 +releaseDate: 2015-11-23 # Project urls url: 'http://gitblit.com' -issuesUrl: 'http://code.google.com/p/gitblit/issues/list' +issuesUrl: 'https://github.com/gitblit/gitblit' socialNetworkUrl: 'https://plus.google.com/114464678392593421684' forumUrl: 'http://groups.google.com/group/gitblit' mavenUrl: 'http://gitblit.github.io/gitblit-maven' @@ -102,19 +102,20 @@ # Convenience properties for dependencies properties: { - jetty.version : 9.2.2.v20140723 - wicket.version : 1.4.21 - lucene.version : 4.10.0 - jgit.version : 3.5.0.201409260305-r - groovy.version : 2.3.3 - bouncycastle.version : 1.49 + jetty.version : 9.2.13.v20150730 + slf4j.version : 1.7.12 + wicket.version : 1.4.22 + lucene.version : 4.10.4 + jgit.version : 4.1.1.201511131810-r + groovy.version : 2.4.4 + bouncycastle.version : 1.52 selenium.version : 2.28.0 wikitext.version : 1.4 - sshd.version: 0.12.0 - mina.version: 2.0.7 - guice.version : 4.0-beta4 + sshd.version: 1.0.0 + mina.version: 2.0.9 + guice.version : 4.0 # Gitblit maintains a fork of guice-servlet - guice-servlet.version : 4.0-gb1 + guice-servlet.version : 4.0-gb2 } # Dependencies @@ -131,11 +132,11 @@ 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:17.0' :war :fedclient +- compile 'com.google.guava:guava:18.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 -- compile 'org.slf4j:slf4j-log4j12:1.7.7' :war :fedclient +- compile 'log4j:log4j:1.2.17' :war :fedclient :manager +- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager +- compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient :manager - compile 'com.sun.mail:javax.mail:1.5.1' :war - compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient - compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar @@ -147,7 +148,7 @@ - compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient - compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient - compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient -- compile 'org.pegdown:pegdown:1.4.2' :war +- compile 'org.pegdown:pegdown:1.5.0' :war - compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war - compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war - compile 'org.fusesource.wikitext:textile-core:${wikitext.version}' :war @@ -162,20 +163,20 @@ - 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:2.2.2' :war :fedclient :manager :api +- compile 'com.google.code.gson:gson:2.3.1' :war :fedclient :manager :api - compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war -- compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war +- compile 'com.unboundid:unboundid-ldapsdk:2.3.8' :war - 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 - 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.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 +- compile 'org.freemarker:freemarker:2.3.22' :war +- compile 'com.github.dblock.waffle:waffle-jna:1.7.3' :war +- compile 'org.kohsuke:libpam4j:1.8' :war +- compile 'args4j:args4j:2.0.29' :war :fedclient - compile 'commons-codec:commons-codec:1.7' :war -- compile 'redis.clients:jedis:2.3.1' :war +- compile 'redis.clients:jedis:2.6.2' :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 @@ -184,6 +185,7 @@ - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar - test 'org.seleniumhq.selenium:selenium-support:${selenium.version}' @jar - test 'org.seleniumhq.selenium:selenium-firefox-driver:${selenium.version}' +- test 'org.mockito:mockito-core:1.10.19' # Dependencies with the "build" scope are retrieved # and injected into the Ant runtime classpath - build 'jacoco' -- Gitblit v1.9.1