Temporarily depend on patched guice-servlet (guice-807)

diff --git a/.classpath b/.classpath
index 9c3e7b8cf7e944cfa7a0b0268b93c9397a4c7e2b..a7a8963425547c77f22e02f7c091dc19dcf0567f 100644 (file)
--- 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 b25a4222af408d2c59294cfefd01155e00ffb933..3514577e24b92d52ccab01aab2ec450df807d7cd 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -113,6 +113,7 @@ properties: {
   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 @@ properties: {
 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 f8a8a6741f97b8739d567e25745e8b872e9a9c39..8912282a072963c2de91e140f6f499a9c697ed37 100644 (file)
--- 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>