From 575d4f690b8eaedfdd3981fe7c00ecc41d358e73 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:57:47 -0400
Subject: [PATCH] Temporarily depend on patched guice-servlet (guice-807)
---
.classpath | 2 +-
build.moxie | 3 ++-
gitblit.iml | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.classpath b/.classpath
index 9c3e7b8..a7a8963 100644
--- a/.classpath
+++ b/.classpath
@@ -9,7 +9,7 @@
<classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
<classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
<classpathentry kind="lib" path="ext/guava-16.0.1.jar" sourcepath="ext/src/guava-16.0.1.jar" />
- <classpathentry kind="lib" path="ext/guice-servlet-4.0-beta4.jar" sourcepath="ext/src/guice-servlet-4.0-beta4.jar" />
+ <classpathentry kind="lib" path="ext/guice-servlet-4.0-SNAPSHOT.jar" sourcepath="ext/src/guice-servlet-4.0-SNAPSHOT.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.7.7.jar" sourcepath="ext/src/slf4j-api-1.7.7.jar" />
diff --git a/build.moxie b/build.moxie
index b25a422..3514577 100644
--- a/build.moxie
+++ b/build.moxie
@@ -113,6 +113,7 @@
sshd.version: 0.11.1-atlassian-1
mina.version: 2.0.7
guice.version : 4.0-beta4
+ guice-servlet.version : 4.0-SNAPSHOT
}
# Dependencies
@@ -129,7 +130,7 @@
dependencies:
# Dagger dependency injection library (annotation processor)
- compile 'com.google.inject:guice:${guice.version}' :war
-- compile 'com.google.inject.extensions:guice-servlet:${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
diff --git a/gitblit.iml b/gitblit.iml
index f8a8a67..8912282 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -58,13 +58,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guice-servlet-4.0-beta4.jar">
+ <library name="guice-servlet-4.0-SNAPSHOT.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-beta4.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-beta4.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-SNAPSHOT.jar!/" />
</SOURCES>
</library>
</orderEntry>
--
Gitblit v1.9.1