This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new d42087a Improve LICENSE.txt/NOTICE.txt compliance with ASF guidelines
d42087a is described below
commit d42087a63309178b96909c012dd0073fe0b6ea11
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Mar 31 11:45:00 2021 -0500
Improve LICENSE.txt/NOTICE.txt compliance with ASF guidelines
Patch by Ben Bromhead and Anthony Grasso, reviewed by mck and
brandonwilliams for CASSANDRA-16550
---
LICENSE.txt | 41 +++++++++++++++++++++++++----
NOTICE.txt | 86 +++----------------------------------------------------------
2 files changed, 40 insertions(+), 87 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index d5c4984..76c133b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -202,8 +202,39 @@
limitations under the License.
-THIRD-PARTY DEPENDENCIES
-========================
-Convenience copies of some third-party dependencies are distributed with
-Apache Cassandra as Java jar files in lib/. Licensing information for
-these files can be found in the lib/licenses directory.
+ APACHE CASSANDRA SUBCOMPONENTS:
+
+ Apache Cassandra includes a number of subcomponents with
+ separate copyright notices and license terms. Your use of the source
+ code for these subcomponents is subject to the terms and
+ conditions of the following licenses.
+
+ This product bundles a file (AbstractIterator.java) from Chronicle-Bytes,
+ copyright higherfrequencytrading.com, which is available under an
+ Apache License version 2.
+
+ This product bundles a file (AbstractIterator.java) from Guava,
+ copyright The Guava Authors, which is available under an
+ Apache License version 2.
+
+ This product bundles a file (LongTimSort.java) from Android libcore,
+ copyright The Android Open Source Project, which is available under an
+ Apache License version 2.
+
+ This product bundles several files (LongTimSort.java) from PATRICIA Trie
+ copyright Roger Kapsi and Sam Berlin, which is available under an
+ Apache License version 2.
+
+ This product bundles a file (VIntCoding.java) from Protocol Buffers
+ copyright Google Inc., which is available under n BSD license.
+
+ Thus product bundles material adapted from Cassandra, The Definitive Guide.
+ Published by O'Reilly Media, Inc. Copyright Jeff Carpenter and Eben Hewitt
+ and used with their permission.
+
+ This product bundles The Project Gutenberg EBook of Adventures of
+ Huckleberry Finn, Complete by Mark Twain (Samuel Clemens), which is in
+ the public domain.
+
+ This product bundles code (internalOffer) that is written by Doug Lea and
+ Martin Buchholz available under a Creative Commons zero license.
diff --git a/NOTICE.txt b/NOTICE.txt
index 7d215d2..54f1d8d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,85 +4,7 @@ Copyright 2009-2021 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
-Parts of the DataStax Java Driver included in source form
-(https://github.com/datastax/java-driver)
-Copyright DataStax, 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.
-
-Some alternate data structures provided by concurrentlinkedhashmap
-from http://code.google.com/p/concurrentlinkedhashmap/.
-Copyright 2009 Benjamin Manes
-
-Alternative collection types provided by google-collections from
-http://code.google.com/p/google-collections/.
-Copyright (C) 2007 Google Inc.
-
-JSON (de)serialization provided by jackson (http://jackson.codehaus.org).
-Copyright (C) 2010 Tatu Saloranta and others.
-
-Alternative JSON (de)serialization by json-simple from
-(http://code.google.com/p/json-simple).
-Copyright (C) 2009 Fang Yidong and Chris Nokleberg
-
-This product includes the Jetty HTTP server
-(http://jetty.codehaus.org/jetty/).
-Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-
-YAML support provided by snakeyaml (http://code.google.com/p/snakeyaml/).
-Copyright (c) 2008-2010 Andrey Somov
-
-Compression support provided by snappy-java
(http://code.google.com/p/snappy-java/)
-Written by Taro L. Saito.
-
-Streaming compression support provided by ning-compress
-(https://github.com/ning/compress)
-Copyright 2009-2010 Ning, Inc.
-
-CQL Native transport uses Netty
-(https://netty.io/)
-Copyright (C) 2011 The Netty Project
-
-LZ4 compression support provided by lz4-java
(http://github.com/jpountz/lz4-java)
-Written by Adrien Grand.
-Contains bindings to the C LZ4 implementation (http://code.google.com/p/lz4/)
-Copyright (C) 2011-2012, Yann Collet.
-
-Airline
-(https://github.com/airlift/airline)
-Copyright 2011, Dain Sundstrom [email protected]
-Copyright 2010, Cedric Beust [email protected]
-
-HLL++ support provided by stream-lib
-(https://github.com/addthis/stream-lib)
-
-Eclipse JDT
-Java compilation software for user-defined-functions is provided by Eclipse,
-which is open source software. The original software and
-related information is available at http://www.eclipse.org/
-(http://www.eclipse.org/jdt/)
-
-SIGAR
-http://sigar.hyperic.com/
-
-OHC
-(https://github.com/snazy/ohc)
-Java Off-Heap-Cache, licensed under APLv2
-Copyright 2014-2015 Robert Stupp, Germany.
-
-Protocol buffers for varint encoding
-https://developers.google.com/protocol-buffers/
-Copyright 2008 Google Inc. All rights reserved.
-BSD 3-clause
-
-ASM
-(http://asm.ow2.org/)
-Copyright (c) 2000-2011 INRIA, France Telecom
-
-HdrHistogram
-http://hdrhistogram.org
-
-JCTools
-http://jctools.github.io/JCTools/
+Android Code
+Copyright 2005-2008 The Android Open Source Project
+This product includes software developed as part of
+The Android Open Source Project (http://source.android.com).
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
