From: James Moger <james.moger@gitblit.com>
Date: Thu, 3 Jul 2014 20:19:49 +0000 (-0400)
Subject: Update to Guava 17
X-Git-Tag: v1.7.0~1^2~202^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9991de4d121dc6124d40a10d86d879b17b39de68;p=gitblit.git

Update to Guava 17
---

diff --git a/.classpath b/.classpath
index 274dee2b..9873ddb4 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry kind="lib" path="ext/guice-4.0-beta4.jar" sourcepath="ext/src/guice-4.0-beta4.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-16.0.1.jar" sourcepath="ext/src/guava-16.0.1.jar" />
+	<classpathentry kind="lib" path="ext/guava-17.0.jar" sourcepath="ext/src/guava-17.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/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" />
diff --git a/build.moxie b/build.moxie
index 735e1857..3005b0ee 100644
--- a/build.moxie
+++ b/build.moxie
@@ -132,7 +132,7 @@ properties: {
 dependencies:
 - compile 'com.google.inject:guice:${guice.version}' :war :fedclient
 - compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
-- compile 'com.google.guava:guava:16.0.1' :war :fedclient
+- compile 'com.google.guava:guava:17.0' :war :fedclient
 - compile 'com.intellij:annotations:12.0' :war
 - compile 'log4j:log4j:1.2.17' :war :fedclient
 - compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient
diff --git a/gitblit.iml b/gitblit.iml
index cc9324f5..878fdc3c 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -47,13 +47,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="guava-16.0.1.jar">
+      <library name="guava-17.0.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/guava-16.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/guava-16.0.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>