This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch UpdateLicenses in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-cpp.git
commit 3fa7a7e39101c0020cd9390681ae6f4c7bd6eb23 Author: Lee Rhodes <[email protected]> AuthorDate: Thu May 7 18:20:25 2020 -0700 Updated License, Notice, gitignore Please double check the License file if we are still using all the 3rd party licenses. --- .gitignore | 1 + LICENSE | 168 +++++++++++++++++++++++++++++++++++++++++++++---------------- NOTICE | 37 ++------------ 3 files changed, 129 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index 4303c9c..97976c8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ bin/ build/ lib/ +Default/ # Log file diff --git a/LICENSE b/LICENSE index 937b0f0..a7ccd16 100644 --- a/LICENSE +++ b/LICENSE @@ -176,55 +176,135 @@ 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] +APPENDIX A: How to apply the Apache License to your work. - 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 + 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] - http://www.apache.org/licenses/LICENSE-2.0 + 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 - 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. + http://www.apache.org/licenses/LICENSE-2.0 - Additional licenses relevant to this work. + 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-cpp (incubating) includes a number of source - files with separate copyright notices and license terms. Your use of + + +APPENDIX B: Additional licenses relevant to this product. + + 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. - -MIT License - -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. + conditions of the following licenses. + + + + ============================================================= + MIT License + ============================================================= + Original source code: + https://github.com/benjaminjack/python_cpp_example + ------------------------------------------------------------- + Copyright (c) 2017 Benjamin R. Jack + + MIT License (https://opensource.org/licenses/MIT): + + 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. + ------------------------------------------------------------- + Code locations: + * https://github.com/apache/incubator-datasketches-cpp/blob/master/setup.py + that is adapted from the above. + + + + ============================================================= + Boost License (https://www.boost.org/LICENSE_1_0.txt) + ============================================================= + Original source code: + https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp + ------------------------------------------------------------- + Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved. + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + 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, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + ------------------------------------------------------------- + Code Locations + * https://github.com/apache/incubator-datasketches-cpp/blob/master/common/test/catch.hpp + that is adapted from the above. + + + + ============================================================= + Public Domain + ============================================================= + Original source code: + https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp + Placed in the Public Domain by Austin Appleby + + Code Locations + common/include/MurmurHash3.h + that is adapted from the above. + ------------------------------------------------------------- + Original source code: + * https://graphics.stanford.edu/~seander/bithacks.html + * Placed in the Public Domain by Sean Eron Anderson + + Code Locations + * common/include/CommonUtil.h + that is adapted from the above. \ No newline at end of file diff --git a/NOTICE b/NOTICE index 95aca4d..41a4505 100644 --- a/NOTICE +++ b/NOTICE @@ -1,40 +1,11 @@ Apache DataSketches-cpp (incubating) -Copyright 2019 The Apache Software Foundation +Copyright 2020 The Apache Software Foundation + +Copyright 2015-2018 Yahoo +Copyright 2019 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: - -Public Domain -============= - -This product contains code written by Austin Appleby and placed in the public domain. -The original: https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp - * common/include/MurmurHash3.h - -This product contains code published by Sean Eron Anderson and placed in the public domain. -The original: https://graphics.stanford.edu/~seander/bithacks.html - * common/include/CommonUtil.h - -MIT License -=========== - -This product contains code by Benjamin R. Jack: -https://github.com/apache/incubator-datasketches-cpp/blob/master/setup.py -adapted from: -https://github.com/benjaminjack/python_cpp_example -Copyright (c) 2017 Benjamin R. Jack - -Boost License -============= - -This product contains code copyright by Two Blue Cubes Ltd.: -https://github.com/apache/incubator-datasketches-cpp/blob/master/common/test/catch.hpp -borrowed from: -https://github.com/catchorg/Catch2/blob/master/single_include/catch2/catch.hpp -using the Boost 1.0 License -https://github.com/catchorg/Catch2/blob/master/LICENSE.txt --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
