Author: eevans
Date: Wed Feb 17 16:43:47 2010
New Revision: 911066
URL: http://svn.apache.org/viewvc?rev=911066&view=rev
Log:
use ivy for google-collect; remove local copy
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
Removed:
incubator/cassandra/trunk/lib/google-collect-1.0-rc1.jar
Modified:
incubator/cassandra/trunk/LICENSE.txt
incubator/cassandra/trunk/NOTICE.txt
incubator/cassandra/trunk/ivy.xml
incubator/cassandra/trunk/test/cassandra.in.sh
Modified: incubator/cassandra/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/LICENSE.txt?rev=911066&r1=911065&r2=911066&view=diff
==============================================================================
--- incubator/cassandra/trunk/LICENSE.txt (original)
+++ incubator/cassandra/trunk/LICENSE.txt Wed Feb 17 16:43:47 2010
@@ -209,8 +209,7 @@
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
Modified: incubator/cassandra/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=911066&r1=911065&r2=911066&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Wed Feb 17 16:43:47 2010
@@ -7,10 +7,6 @@
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.
Modified: incubator/cassandra/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=911066&r1=911065&r2=911066&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Wed Feb 17 16:43:47 2010
@@ -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>
Modified: incubator/cassandra/trunk/test/cassandra.in.sh
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/cassandra.in.sh?rev=911066&r1=911065&r2=911066&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/cassandra.in.sh (original)
+++ incubator/cassandra/trunk/test/cassandra.in.sh Wed Feb 17 16:43:47 2010
@@ -27,7 +27,7 @@
# 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
