cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r911071 - in /incubator/cassandra/trunk: LICENSE.txt NOTICE.txt ivy.xml lib/log4j-1.2.15.jar lib/slf4j-api-1.5.8.jar lib/slf4j-log4j12-1.5.8.jar
Date Wed, 17 Feb 2010 16:44:10 GMT
Author: eevans
Date: Wed Feb 17 16:44:09 2010
New Revision: 911071

URL: http://svn.apache.org/viewvc?rev=911071&view=rev
Log:
use ivy for slf4j and remove local jars

Note, slf4j-log4j12 depends on log4j (a slightly older version), so
that jar was removed as well.

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

Removed:
    incubator/cassandra/trunk/lib/log4j-1.2.15.jar
    incubator/cassandra/trunk/lib/slf4j-api-1.5.8.jar
    incubator/cassandra/trunk/lib/slf4j-log4j12-1.5.8.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=911071&r1=911070&r2=911071&view=diff
==============================================================================
--- incubator/cassandra/trunk/LICENSE.txt (original)
+++ incubator/cassandra/trunk/LICENSE.txt Wed Feb 17 16:44:09 2010
@@ -498,29 +498,3 @@
 Agreement will bring a legal action under this Agreement more than one year
 after the cause of action arose. Each party waives its rights to a jury trial in
 any resulting litigation.
-
-
-For lib/slf4j-api-1.5.8.jar and lib/slf4j-log4j12-1.5.8.jar:
-------------------------------------------------------------
-
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: incubator/cassandra/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/NOTICE.txt?rev=911071&r1=911070&r2=911071&view=diff
==============================================================================
--- incubator/cassandra/trunk/NOTICE.txt (original)
+++ incubator/cassandra/trunk/NOTICE.txt Wed Feb 17 16:44:09 2010
@@ -16,9 +16,6 @@
 
 This product makes use of the JUnit test framework (http://junit.org).
 
-Logging abstraction provided by SLF4J (http://www.slf4j.org).
-Copyright (c) 2004-2008 QOS.ch
-
 Some alternate data structures provided by concurrentlinkedhashmap
 from http://code.google.com/p/concurrentlinkedhashmap/.
 Copyright 2009 Benjamin Manes

Modified: incubator/cassandra/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=911071&r1=911070&r2=911071&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Wed Feb 17 16:44:09 2010
@@ -38,6 +38,8 @@
                 rev="3.2.1"/>
     <dependency org="commons-lang" name="commons-lang" rev="2.4"/>
     <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"/>
   </dependencies>
 </ivy-module>
 



Mime
View raw message