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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/build.moxie b/build.moxie
index 2f86a3c..8ca5275 100644
--- a/build.moxie
+++ b/build.moxie
@@ -96,9 +96,10 @@
- { 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
+repositories: central, eclipse-snapshots, eclipse, atlassian-contrib, gitblit
# Convenience properties for dependencies
properties: {
@@ -112,6 +113,9 @@
wikitext.version : 1.4
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
@@ -127,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
--
Gitblit v1.9.1