You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ee...@apache.org on 2010/02/17 17:44:05 UTC
svn commit: r911070 - in /incubator/cassandra/trunk: LICENSE.txt NOTICE.txt
ivy.xml lib/jline-0.9.94.jar
Author: eevans
Date: Wed Feb 17 16:44:05 2010
New Revision: 911070
URL: http://svn.apache.org/viewvc?rev=911070&view=rev
Log:
use ivy for jline and remove local copy
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
Removed:
incubator/cassandra/trunk/lib/jline-0.9.94.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=911070&r1=911069&r2=911070&view=diff
==============================================================================
--- incubator/cassandra/trunk/LICENSE.txt (original)
+++ incubator/cassandra/trunk/LICENSE.txt Wed Feb 17 16:44:05 2010
@@ -282,43 +282,6 @@
been invented or conceived.
-For lib/jline-0.9.94.jar:
--------------------------
-
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
For lib/junit-4.6.jar:
----------------------
Modified: incubator/cassandra/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=911070&r1=911069&r2=911070&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Wed Feb 17 16:44:05 2010
@@ -11,9 +11,6 @@
http://sourceforge.net/projects/high-scale-lib/.
Written by Cliff Click and released as Public Domain.
-This product makes use of JLine for console input (http://jline.sf.net).
-Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>
-
JSON support provided by json-simple (http://code.google.com/p/json-simple/).
Copyright 2006-2009 Yidong Fang.
Modified: incubator/cassandra/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=911070&r1=911069&r2=911070&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Wed Feb 17 16:44:05 2010
@@ -37,6 +37,7 @@
<dependency org="commons-collections" name="commons-collections"
rev="3.2.1"/>
<dependency org="commons-lang" name="commons-lang" rev="2.4"/>
+ <dependency org="jline" name="jline" rev="0.9.94"/>
</dependencies>
</ivy-module>