diff options
| author | James Moger <james.moger@gitblit.com> | 2015-09-18 14:07:38 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-09-18 14:07:38 -0400 |
| commit | 7a19abdb9d5721a2479f65da596a23ac3427241c (patch) | |
| tree | e8bf0f7865c61c9309800559ead9c86b47ad4a22 | |
| parent | 4e94467ee0deefaf38bb9dea48cacccb375481a3 (diff) | |
| download | gitblit-7a19abdb9d5721a2479f65da596a23ac3427241c.tar.gz gitblit-7a19abdb9d5721a2479f65da596a23ac3427241c.zip | |
Update to Guice 4.0 final with -gb2 ServletFilter fix
| -rw-r--r-- | .classpath | 4 | ||||
| -rw-r--r-- | build.moxie | 4 | ||||
| -rw-r--r-- | gitblit.iml | 12 | ||||
| -rw-r--r-- | releases.moxie | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -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 38f81406..e64c8b72 100644 --- a/build.moxie +++ b/build.moxie @@ -113,9 +113,9 @@ properties: { 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 6eab2a61..56613a30 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 5fdb64ca..f40eb770 100644 --- a/releases.moxie +++ b/releases.moxie @@ -31,7 +31,7 @@ r27: { - 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 |