diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-12 19:25:12 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-07-03 16:57:47 -0400 |
| commit | 575d4f690b8eaedfdd3981fe7c00ecc41d358e73 (patch) | |
| tree | 51cf0ed376789eeb9ab63f2a9faa14dd417f3c7e | |
| parent | 52daaea33dab5d10ec7bd7164a4ce6560c56c8d4 (diff) | |
| download | gitblit-575d4f690b8eaedfdd3981fe7c00ecc41d358e73.tar.gz gitblit-575d4f690b8eaedfdd3981fe7c00ecc41d358e73.zip | |
Temporarily depend on patched guice-servlet (guice-807)
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | build.moxie | 3 | ||||
| -rw-r--r-- | gitblit.iml | 6 |
3 files changed, 6 insertions, 5 deletions
@@ -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 b25a4222..3514577e 100644 --- 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 f8a8a674..8912282a 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> |