You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/09/28 00:41:48 UTC
[incubator-datasketches-memory] branch master updated: Update
License, Notice files
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
The following commit(s) were added to refs/heads/master by this push:
new 8bfa6df Update License, Notice files
8bfa6df is described below
commit 8bfa6df5bcaebe95a39fdfbd9d8f81b4edd9a382
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Sep 27 17:41:40 2019 -0700
Update License, Notice files
---
LICENSE | 212 +++++++++++++++++++++++++++++++++++++++++++---------------------
NOTICE | 59 +-----------------
2 files changed, 145 insertions(+), 126 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9e11e0e..41e0d89 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,6 +176,8 @@
END OF TERMS AND CONDITIONS
+
+
APPENDIX A: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
@@ -186,7 +188,7 @@ APPENDIX A: How to apply the Apache License to your work.
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
- ---------------------------------------------
+ -------------------------------------------------------------
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
@@ -200,75 +202,147 @@ APPENDIX A: How to apply the Apache License to your work.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- ---------------------------------------------
+ -------------------------------------------------------------
+
-APPENDIX B: Additional licenses relevant to this work.
- Apache DataSketches-memory (INCUBATING):
+APPENDIX B: Additional licenses relevant to this product:
- Apache DataSketches-memory (incubating) includes a number of source
- files with separate copyright notices and license terms. Your use of
+ This product includes a number of source files with code that has been
+ adapted from 3rd party sources including sources that may be subject
+ to different 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. See the NOTICE file for details
- of the licence dependencies that refer to the following licences.
-
-Google Protobuf License:
-================================
-Copyright 2008 Google Inc.
-
-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 Google Inc. 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.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it. This code is not
-standalone and requires a support library to be linked with it. This
-support library is itself covered by the above license.
-
-BSD-2-Clause License
-================================
-Copyright (C) 2012-2016, Yann Collet.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. 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.
-
-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
-HOLDER 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.
+ conditions of the following licenses.
+
+
+
+ =============================================================
+ Apache License version 2.0 (see above)
+ =============================================================
+ DirectMemory
+ Copyright 2015 Odnoklassniki Ltd, Mail.Ru Group
+
+ Code locations:
+ -------------------------------------------------------------
+ This product contains a method to create a dummy read-only ByteBuffer using unsafe:
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java,
+ Method: getDummyReadOnlyDirectByteBuffer(...)
+ and adapted from Java source code located at:
+ * https://github.com/odnoklassniki/one-nio/blob/master/src/one/nio/mem/DirectMemory.java,
+ Method: wrap(...).
+
+
+ =============================================================
+ Apache License version 2.0 (see above)
+ =============================================================
+ Zero-Allocation-Hashing
+ Copyright 2015 Higher Frequency Trading http://www.higherfrequencytrading.com
+
+ Code locations:
+ -------------------------------------------------------------
+ This product contains code to implement and test the xxHash function:
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/XxHash64.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
+ Method: collisionTest(),
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
+ Method: testWithSeed() and HASHES_OF_LOOPING_BYTES_WITH_SEED_42 test data,
+ and adapted from Java source code located at:
+ * https://github.com/OpenHFT/Zero-Allocation-Hashing
+
+
+
+ =============================================================
+ Google Protobuf License:
+ =============================================================
+ Copyright 2008 Google Inc.
+
+ 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 Google Inc. 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.
+
+ Code generated by the Protocol Buffer compiler is owned by the owner
+ of the input file used when generating it. This code is not
+ standalone and requires a support library to be linked with it. This
+ support library is itself covered by the above license.
+
+ Code locations:
+ -------------------------------------------------------------
+ This product contains code for encoding, decoding and testing UTF8:
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/Utf8.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/Utf8Test.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
+ and adapted from Java source code located at:
+ * https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/main/java/com/google/protobuf/Utf8.java,
+ * https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/test/java/com/google/protobuf/Utf8Test.java,
+ * https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java,
+
+
+
+ =============================================================
+ BSD-2-Clause License
+ =============================================================
+ Copyright (C) 2012-2016, Yann Collet.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. 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.
+
+ 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
+ HOLDER 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.
+
+ Code locations:
+ -------------------------------------------------------------
+ This product contains code for encoding, decoding and testing UTF8:
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/XxHash64.java
+ and adapted from C++ code located at:
+ * https://github.com/Cyan4973/xxHash/blob/dev/xxhash.c,
+ * https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h
+
+
+
+ =============================================================
+ Public Domain (optional notice)
+ =============================================================
+ This product contains the text of Lincoln's Gettysburg Address, which is in the public domain, and is used in various file tests.
+ This file is read-only and tested for its exact character sequence and cannot be appended with any additional text.
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/MemoryTest.java
+ * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/UtilTest.java
diff --git a/NOTICE b/NOTICE
index 78465e5..05d35e4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,66 +1,11 @@
Apache DataSketches Memory
+Copyright 2019 - The Apache Software Foundation
Copyright 2015-2018 Yahoo
-Copyright 2018- Verizon
-Copyright 2019 The Apache Software Foundation
+Copyright 2018 - Verizon Media
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Prior to moving to ASF, the software for this project was developed at
Yahoo (now Verizon Media) (https://developer.yahoo.com).
-
-This product contains 3rd party code under the following licenses:
-
-Apache License version 2.0 (see LICENSE)
-================================
-This product contains a method to create a dummy read-only ByteBuffer using unsafe:
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java
- Method: getDummyReadOnlyDirectByteBuffer(...).
-This code was adapted from
- https://github.com/odnoklassniki/one-nio/blob/master/src/one/nio/mem/DirectMemory.java
- Method: wrap(...),
- Copyright 2015 Odnoklassniki Ltd, Mail.Ru Group
-
-This product contains code to implement and test the xxHash function:
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/XxHash64.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
- Method: collisionTest(),
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
- Method: testWithSeed() and HASHES_OF_LOOPING_BYTES_WITH_SEED_42 test data,
-This code was adapted from
- https://github.com/OpenHFT/Zero-Allocation-Hashing,
- Copyright 2015 Higher Frequency Trading http://www.higherfrequencytrading.com
-
-
-Google Protobuf License (see LICENSE):
-================================
-This product contains code for encoding, decoding and testing UTF8:
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/Utf8.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/Utf8Test.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
-This code was adapted from
- https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/main/java/com/google/protobuf/Utf8.java,
- https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/test/java/com/google/protobuf/Utf8Test.java,
- https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java,
- all Copyright 2008 Google Inc.
-
-
-BSD-2-Clause License (see LICENSE):
-================================
-This product contains code for encoding, decoding and testing UTF8:
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/main/java/org/apache/datasketches/memory/XxHash64.java
-and adapted from C++
- https://github.com/Cyan4973/xxHash/blob/dev/xxhash.c,
- https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h,
- both Copyright (C) 2012-2016, Yann Collet.
-
-
-Public Domain (optional notice)
-================================
- This product contains the text of Lincoln's Gettysburg Address, which is in the public domain, and is used in various file tests.
- This file is read-only and tested for its exact character sequence and cannot be appended with any additional text.
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/MemoryTest.java
- * https://github.com/apache/incubator-datasketches-memory/blob/master/src/test/java/org/apache/datasketches/memory/UtilTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org