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:38:41 UTC
[incubator-datasketches-java] 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-java.git
The following commit(s) were added to refs/heads/master by this push:
new 8314eb8 Update License, Notice files
8314eb8 is described below
commit 8314eb897dd1ffd96c72466630dd2398695f5a7f
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Fri Sep 27 17:38:31 2019 -0700
Update License, Notice files
Better visual separtion in License, reorder first few lines in Notice.
---
LICENSE | 38 ++++++++++++++++++++++++++------------
NOTICE | 4 ++--
2 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/LICENSE b/LICENSE
index 06a14e9..720d42f 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
@@ -202,6 +204,8 @@ APPENDIX A: How to apply the Apache License to your work.
limitations under the License.
-------------------------------------------------------------
+
+
APPENDIX B: Additional licenses relevant to this product:
This product includes a number of source files with code that has been
@@ -209,35 +213,43 @@ APPENDIX B: Additional licenses relevant to this product:
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.
-
+
+
+
+ =============================================================
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 the xxHash function:
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/XxHash.java
and adapted from Java source code located at:
* https://github.com/OpenHFT/Zero-Allocation-Hashing/blob/master/src/main/java/net/openhft/hashing/XxHash.java
-
+
+
+ =============================================================
BSD-2-Clause License
=============================================================
xxHash Library
Copyright (c) 2012-present, Yann Collet
All rights reserved.
-
+
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-
+
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.
-
+
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
@@ -248,8 +260,8 @@ APPENDIX B: Additional licenses relevant to this product:
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 subject to the BSD-2-Clause License:
+
+ Code locations:
-------------------------------------------------------------
This product contains code to implement the xxHash function:
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/XxHash.java
@@ -259,16 +271,18 @@ APPENDIX B: Additional licenses relevant to this product:
* https://github.com/Cyan4973/xxHash/blob/dev/xxhash.h
+
+ =============================================================
Public Domain (optional)
=============================================================
This product contains code to implement and test Austin Appleby's C++ public domain implementation of the
- MurmurHash3 algorithm,
+ MurmurHash3 algorithm:
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/MurmurHash3.java
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/MurmurHash3Adaptor.java
* https://github.com/apache/incubator-datasketches-java/blob/master/src/main/java/org/apache/datasketches/hash/MurmurHash3v2.java
* https://github.com/apache/incubator-datasketches-java/blob/master/src/test/java/org/apache/datasketches/hash/MurmurHash3AdaptorTest.java
* https://github.com/apache/incubator-datasketches-java/blob/master/src/test/java/org/apache/datasketches/hash/MurmurHash3Test.java
* https://github.com/apache/incubator-datasketches-java/blob/master/src/test/java/org/apache/datasketches/hash/MurmurHash3v2Test.java
- and adapted from C++ source code located at
- https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
+ and adapted from C++ source code located at:
+ * https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
diff --git a/NOTICE b/NOTICE
index 9fc6725..3e4e829 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache DataSketches Java
+Copyright 2019 - The Apache Software Foundation
Copyright 2015-2018 Yahoo
-Copyright 2018 - Present, Verizon
-Copyright 2019 - Present, The Apache Software Foundation
+Copyright 2018 - Verizon Media
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org