use ivy for google-collect; remove local copy

Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911066 13f79535-47bb-0310-9956-ffa450edef68

LICENSE.txt

@@ -209,8 +209,7 @@ dependencies that have separate copyright notices and license terms. Your
 use of these libraries is subject to the terms and conditions of the 
 following licenses.
 
-For lib/google-collect-1.0-rc1.jar, lib/clhm-production.jar, and
-lib/json_simple-1.1.jar:
+For lib/clhm-production.jar, and lib/json_simple-1.1.jar:
 
 While developed outside the ASF, these projects are also licensed under
 the Apache License 2.0. The full text of the Apache License 2.0 can be

NOTICE.txt

@@ -7,10 +7,6 @@ Foundation (http://www.apache.org/).
 Parser generation is provided by ANTLR, (http://www.antlr.org/).
 Copyright (c) 2003-2006 Terence Parr
 
-This product makes use of the google-collections library from
-http://code.google.com/p/google-collections/.
-Copyright (C) 2008 Google Inc.
-
 Some alternate data structures provided by high-scale-lib from
 http://sourceforge.net/projects/high-scale-lib/.
 Written by Cliff Click and released as Public Domain.

ivy.xml

@@ -30,6 +30,9 @@
                 name="paranamer-ant" rev="2.1"/>
     <dependency org="org.codehaus.jackson"
                 name="jackson-mapper-asl" rev="1.4.0"/>
+
+    <dependency org="com.google.collections" name="google-collections"
+                rev="1.0"/>
   </dependencies>
 </ivy-module>
 

test/cassandra.in.sh

@@ -27,7 +27,7 @@ cassandra_bin=$cassandra_home/build/classes
 # The java classpath (required)
 CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 
-for jar in $cassandra_home/lib/*.jar; do
+for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done