Update to Guava 17

James Moger

2014-07-03 9991de4d121dc6124d40a10d86d879b17b39de68

Update to Guava 17

 .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" />

 build.moxie

@@ -132,7 +132,7 @@
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

 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>