Update to Guava 17

diff --git a/.classpath b/.classpath
index 274dee2b597119e61d1e7d14022d0bbf52aaeabb..9873ddb47997c0cd37c5643817c97b4a662e7003 100644 (file)
--- 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 735e18579361e10ec4a68549ccf8cfe3584e88af..3005b0eeeb9792ddfb96af89278801dc5ab9d7f3 100644 (file)
--- 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 cc9324f5119bca6be8f72cfc88208d72300fc798..878fdc3ccc669c1e68d65c440e3a067e190cd40f 100644 (file)
--- 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>