From 7a19abdb9d5721a2479f65da596a23ac3427241c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 18 Sep 2015 14:07:38 -0400
Subject: [PATCH] Update to Guice 4.0 final with -gb2 ServletFilter fix
---
.classpath | 4 ++--
releases.moxie | 2 +-
build.moxie | 4 ++--
gitblit.iml | 12 ++++++------
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.classpath b/.classpath
index 08dc450..b05535d 100644
--- a/.classpath
+++ b/.classpath
@@ -5,11 +5,11 @@
<classpathentry kind="src" path="src/test/java" output="bin/test-classes" />
<classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
<classpathentry kind="src" path="src/main/resources" />
- <classpathentry kind="lib" path="ext/guice-4.0-beta5.jar" sourcepath="ext/src/guice-4.0-beta5.jar" />
+ <classpathentry kind="lib" path="ext/guice-4.0.jar" sourcepath="ext/src/guice-4.0.jar" />
<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-18.0.jar" sourcepath="ext/src/guava-18.0.jar" />
- <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb1.jar" sourcepath="ext/src/guice-servlet-4.0-gb1.jar" />
+ <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb2.jar" sourcepath="ext/src/guice-servlet-4.0-gb2.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.12.jar" sourcepath="ext/src/slf4j-api-1.7.12.jar" />
diff --git a/build.moxie b/build.moxie
index 38f8140..e64c8b7 100644
--- a/build.moxie
+++ b/build.moxie
@@ -113,9 +113,9 @@
wikitext.version : 1.4
sshd.version: 1.0.0
mina.version: 2.0.9
- guice.version : 4.0-beta5
+ guice.version : 4.0
# Gitblit maintains a fork of guice-servlet
- guice-servlet.version : 4.0-gb1
+ guice-servlet.version : 4.0-gb2
}
# Dependencies
diff --git a/gitblit.iml b/gitblit.iml
index 6eab2a6..56613a3 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -14,13 +14,13 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
- <library name="guice-4.0-beta5.jar">
+ <library name="guice-4.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guice-4.0-beta5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guice-4.0-beta5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-4.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -58,13 +58,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guice-servlet-4.0-gb1.jar">
+ <library name="guice-servlet-4.0-gb2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb2.jar!/" />
</SOURCES>
</library>
</orderEntry>
diff --git a/releases.moxie b/releases.moxie
index 5fdb64c..f40eb77 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -31,7 +31,7 @@
- Add Priority & Severity fields for tickets (pr-220, ticket-157)
- Add Maintenance ticket type (pr-223, ticket-206)
dependencyChanges:
- - Guice 4.0-beta5 (ticket-80, ticket-219)
+ - Guice 4.0 (ticket-80, ticket-219)
- SLF4j 1.7.12
- gson 2.3.1
- Freemarker 2.3.22
--
Gitblit v1.9.1