From edd8d3769d323ebd1ba08e6be3fa2f824b87fc08 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 05 Mar 2015 09:13:24 -0500 Subject: [PATCH] Fix failure to save Allow Forks repository setting --- build.moxie | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/build.moxie b/build.moxie index 3f18bf5..03c1f7f 100644 --- a/build.moxie +++ b/build.moxie @@ -14,8 +14,8 @@ inceptionYear: 2011 # Current stable release -releaseVersion: 1.6.0 -releaseDate: 2014-06-16 +releaseVersion: 1.6.2 +releaseDate: 2014-10-28 # Project urls url: 'http://gitblit.com' @@ -95,25 +95,25 @@ registeredRepositories: - { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' } - { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' } -- { id: atlassian-contrib, url: 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty' } - { id: gitblit, url: 'http://gitblit.github.io/gitblit-maven' } # Source all dependencies from the following repositories in the specified order -repositories: central, eclipse-snapshots, eclipse, atlassian-contrib, gitblit +repositories: central, eclipse-snapshots, eclipse, gitblit # Convenience properties for dependencies properties: { - jetty.version : 9.2.1.v20140609 + jetty.version : 9.2.9.v20150224 + slf4j.version : 1.7.10 wicket.version : 1.4.21 - lucene.version : 4.8.1 - jgit.version : 3.4.1.201406201815-r - groovy.version : 2.3.3 - bouncycastle.version : 1.49 + lucene.version : 4.10.0 + jgit.version : 3.6.2.201501210735-r + groovy.version : 2.4.1 + bouncycastle.version : 1.51 selenium.version : 2.28.0 wikitext.version : 1.4 - sshd.version: 0.11.1-atlassian-1 - mina.version: 2.0.7 - guice.version : 4.0-beta4 + sshd.version: 0.13.0 + mina.version: 2.0.9 + guice.version : 4.0-beta5 # Gitblit maintains a fork of guice-servlet guice-servlet.version : 4.0-gb1 } @@ -132,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 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient +- compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient - 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 @@ -163,22 +163,23 @@ - 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 'ro.fortsoft.pf4j:pf4j:0.8.0' :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 - test 'junit' # Dependencies for Selenium web page testing - test 'org.seleniumhq.selenium:selenium-java:${selenium.version}' @jar -- Gitblit v1.9.1