From 94146dd495aad8157c423bfd9a1ae47c8e26b32c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:59:08 -0400
Subject: [PATCH] Use forked guice-servlet jar rather than stock jar from Google
---
build.moxie | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/build.moxie b/build.moxie
index 9a4830b..8ca5275 100644
--- a/build.moxie
+++ b/build.moxie
@@ -58,7 +58,7 @@
sourceDirectories:
- compile 'src/main/java'
- compile 'src/main/bugtraq'
-- compile 'src/main/dagger' apt
+- compile 'src/main/gen' apt
- test 'src/test/java'
- test 'src/test/bugtraq'
# Moxie supports one site-scoped directory for mx:doc
@@ -95,22 +95,27 @@
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
+repositories: central, eclipse-snapshots, eclipse, atlassian-contrib, gitblit
# Convenience properties for dependencies
properties: {
jetty.version : 9.2.1.v20140609
wicket.version : 1.4.21
- lucene.version : 4.8.1
- jgit.version : 3.4.0.201406110918-r
- groovy.version : 1.8.8
+ lucene.version : 4.8.1
+ jgit.version : 3.4.1.201406201815-r
+ groovy.version : 2.3.3
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
- sshd.version: 0.11.0
+ sshd.version: 0.11.1-atlassian-1
mina.version: 2.0.7
+ guice.version : 4.0-beta4
+ # Gitblit maintains a fork of guice-servlet
+ guice-servlet.version : 4.0-gb1
}
# Dependencies
@@ -126,8 +131,9 @@
dependencies:
# Dagger dependency injection library (annotation processor)
-- compile 'com.squareup.dagger:dagger:1.1.0' :war apt
-- compile 'com.squareup.dagger:dagger-compiler:1.1.0' :war optional apt
+- compile 'com.google.inject:guice:${guice.version}' :war
+- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
+- compile 'com.google.guava:guava:16.0.1' :war
# Standard dependencies
- compile 'com.intellij:annotations:12.0' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient :authority
@@ -159,7 +165,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 +173,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