Author: eevans
Date: Wed Feb 17 16:44:14 2010
New Revision: 911072
URL: http://svn.apache.org/viewvc?rev=911072&view=rev
Log:
use ivy for json-simple and remove local copy
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
Removed:
incubator/cassandra/trunk/lib/json_simple-1.1.jar
Modified:
incubator/cassandra/trunk/LICENSE.txt
incubator/cassandra/trunk/NOTICE.txt
incubator/cassandra/trunk/ivy.xml
Modified: incubator/cassandra/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/LICENSE.txt?rev=911072&r1=911071&r2=911072&view=diff
==============================================================================
--- incubator/cassandra/trunk/LICENSE.txt (original)
+++ incubator/cassandra/trunk/LICENSE.txt Wed Feb 17 16:44:14 2010
@@ -209,9 +209,9 @@
use of these libraries is subject to the terms and conditions of the
following licenses.
-For lib/clhm-production.jar, and lib/json_simple-1.1.jar:
+For lib/clhm-production.jar:
-While developed outside the ASF, these projects are also licensed under
+While developed outside the ASF, this project is also licensed under
the Apache License 2.0. The full text of the Apache License 2.0 can be
found at top of this file.
Modified: incubator/cassandra/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=911072&r1=911071&r2=911072&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Wed Feb 17 16:44:14 2010
@@ -11,9 +11,6 @@
http://sourceforge.net/projects/high-scale-lib/.
Written by Cliff Click and released as Public Domain.
-JSON support provided by json-simple (http://code.google.com/p/json-simple/).
-Copyright 2006-2009 Yidong Fang.
-
This product makes use of the JUnit test framework (http://junit.org).
Some alternate data structures provided by concurrentlinkedhashmap
Modified: incubator/cassandra/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=911072&r1=911071&r2=911072&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Wed Feb 17 16:44:14 2010
@@ -40,6 +40,7 @@
<dependency org="jline" name="jline" rev="0.9.94"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.5.8"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.8"/>
+ <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"/>
</dependencies>
</ivy-module>
