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/08/23 23:38:33 UTC
[incubator-datasketches-memory] branch master updated: Update
LICENSE and NOTICE files, rename DISCLAIMER to DISCLAIMER-WIP.
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 8952dfb Update LICENSE and NOTICE files, rename DISCLAIMER to DISCLAIMER-WIP.
8952dfb is described below
commit 8952dfbf7c3f1415232f02c7c07aee387864345f
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Aug 23 16:38:25 2019 -0700
Update LICENSE and NOTICE files, rename DISCLAIMER to DISCLAIMER-WIP.
---
DISCLAIMER => DISCLAIMER-WIP | 2 +-
LICENSE | 139 ++++++++++++++++++-------------------------
NOTICE | 61 ++++++++++++++++++-
3 files changed, 118 insertions(+), 84 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER-WIP
similarity index 92%
rename from DISCLAIMER
rename to DISCLAIMER-WIP
index bc44454..c90f3f7 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER-WIP
@@ -15,7 +15,7 @@ un-reviewed licensing conditions. What follows is a list of known
issues the project is currently aware of (note that this list, by
definition, is likely to be incomplete):
- * The LICENSE file is incomplete and will be fixed with the next release.
+ * The LICENSE and NOTICE files may not be complete and will be fixed with the next release.
If you are planning to incorporate this work into your
product or project, please be aware that you will need to conduct a
diff --git a/LICENSE b/LICENSE
index 232f02a..31c922a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,60 +176,46 @@
END OF TERMS AND CONDITIONS
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- 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");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- 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.
-
- APACHE DataSketches-memory (INCUBATING):
-
- Apache DataSketches-memory (incubating) includes a number of source files 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.
-
-Apache License version 2.0
-================================
-
- This product contains a method to create a dummy read-only ByteBuffer using unsafe
- adapted from https://github.com/odnoklassniki/one-nio/blob/master/src/one/nio/mem/DirectMemory.java : wrap(...).
- * src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java : getDummyReadOnlyDirectByteBuffer(...)
-
- This product contains code to implement and test the xxHash function
- adapted from https://github.com/OpenHFT/Zero-Allocation-Hashing
- * src/main/java/org/apache/datasketches/memory/XxHash64.java
- * src/test/java/org/apache/datasketches/memory/XxHash64Test.java
- * src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
-
+APPENDIX A: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ 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");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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):
+
+ Apache DataSketches-memory (incubating) includes a number of source
+ files 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. See the NOTICE file for details
+ of the licence dependencies that refer to the following licences.
Google Protobuf License:
================================
-
-Copyright 2008 Google Inc. All rights reserved.
-
Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+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.
@@ -256,38 +242,29 @@ 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.
-
- This product contains code for encoding, decoding and testing UTF8
- adapted from https://github.com/protocolbuffers/protobuf.
- * src/main/java/org/apache/datasketches/memory/Utf8.java
- * src/test/java/org/apache/datasketches/memory/Utf8Test.java
- * src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
-
+support library is itself covered by the above license.
-The BSD-2-Clause License
+BSD-2-Clause License
================================
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
-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 PROF [...]
-
- This product contains code for encoding, decoding and testing UTF8
- adapted from C++ href="https://github.com/Cyan4973/xxHash.
- * src/main/java/org/apache/datasketches/memory/XxHash64.java
-
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
-Public Domain
-================================
- 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.
- * src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
- * src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
- * src/test/java/org/apache/datasketches/memory/MemoryTest.java
- * src/test/java/org/apache/datasketches/memory/UtilTest.java
-
-
\ No newline at end of file
+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.
diff --git a/NOTICE b/NOTICE
index 66c525c..78465e5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,9 +1,66 @@
+Apache DataSketches Memory
-org.apache.datasketches:memory
-Copyright 2015-2019 The Apache Software Foundation
+Copyright 2015-2018 Yahoo
+Copyright 2018- Verizon
+Copyright 2019 The Apache Software Foundation
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