Merge branch 'cassandra-2.0' into trunk

2013-09-12 18:45:34 +03:00 · 2013-09-12 18:45:34 +03:00 · d57ce28450
parent c1c29d847a 53f19c8495
commit d57ce28450
4 changed files with 1 additions and 1 deletions
--- a/build.xml
+++ b/build.xml
@ -338,7 +338,7 @@
          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/>
          <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.1.2"/>
          <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
-          <dependency groupId="com.google.guava" artifactId="guava" version="13.0.1"/>
+          <dependency groupId="com.google.guava" artifactId="guava" version="15.0"/>
          <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
          <dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
--- a/lib/guava-13.0.1.jar
+++ b/lib/guava-13.0.1.jar
--- a/lib/guava-15.0.jar
+++ b/lib/guava-15.0.jar
--- a/lib/licenses/guava-13.0.1.txt
+++ b/lib/licenses/guava-13.0.1.txt