From 15477dff573d240f8f804d66cf8f6fb5ae18728f Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Thu, 30 Jan 2020 18:32:56 -0800 Subject: [PATCH] Remove invalid license template. Flagged in #109 this template is not a valid template for a license. The correct license was added in #205 Signed-off-by: Tully Foote --- ament_copyright/ament_copyright/licenses.py | 1 - .../template/bsd2_contributing.txt | 3 -- .../ament_copyright/template/bsd2_header.txt | 31 ------------------- .../ament_copyright/template/bsd2_license.txt | 30 ------------------ ament_copyright/setup.py | 1 - 5 files changed, 66 deletions(-) delete mode 100644 ament_copyright/ament_copyright/template/bsd2_contributing.txt delete mode 100644 ament_copyright/ament_copyright/template/bsd2_header.txt delete mode 100644 ament_copyright/ament_copyright/template/bsd2_license.txt diff --git a/ament_copyright/ament_copyright/licenses.py b/ament_copyright/ament_copyright/licenses.py index 8e658a7f..53db89ab 100644 --- a/ament_copyright/ament_copyright/licenses.py +++ b/ament_copyright/ament_copyright/licenses.py @@ -38,7 +38,6 @@ def read_license_data(path, name, prefix): apache2 = read_license_data(TEMPLATE_DIRECTORY, 'Apache License, Version 2.0', 'apache2') -bsd2 = read_license_data(TEMPLATE_DIRECTORY, 'BSD License 2.0', 'bsd2') bsd_3clause = read_license_data(TEMPLATE_DIRECTORY, '3-Clause BSD License', 'bsd_3clause') mit = read_license_data(TEMPLATE_DIRECTORY, 'MIT License', 'mit') gplv3 = read_license_data(TEMPLATE_DIRECTORY, 'GNU General Public License 3.0', 'gplv3') diff --git a/ament_copyright/ament_copyright/template/bsd2_contributing.txt b/ament_copyright/ament_copyright/template/bsd2_contributing.txt deleted file mode 100644 index 5e190bdc..00000000 --- a/ament_copyright/ament_copyright/template/bsd2_contributing.txt +++ /dev/null @@ -1,3 +0,0 @@ -Any contribution that you make to this repository will -be under the BSD license 2.0, as dictated by that -[license](https://opensource.org/licenses/BSD-3-Clause). diff --git a/ament_copyright/ament_copyright/template/bsd2_header.txt b/ament_copyright/ament_copyright/template/bsd2_header.txt deleted file mode 100644 index 116f1f3f..00000000 --- a/ament_copyright/ament_copyright/template/bsd2_header.txt +++ /dev/null @@ -1,31 +0,0 @@ -{copyright} -All rights reserved. - -Software License Agreement (BSD License 2.0) - -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 {copyright_holder} 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. diff --git a/ament_copyright/ament_copyright/template/bsd2_license.txt b/ament_copyright/ament_copyright/template/bsd2_license.txt deleted file mode 100644 index 24d43da7..00000000 --- a/ament_copyright/ament_copyright/template/bsd2_license.txt +++ /dev/null @@ -1,30 +0,0 @@ -All rights reserved. - -Software License Agreement (BSD License 2.0) - -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 the copyright holder 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. diff --git a/ament_copyright/setup.py b/ament_copyright/setup.py index 3ba405c5..6f54ee9a 100644 --- a/ament_copyright/setup.py +++ b/ament_copyright/setup.py @@ -41,7 +41,6 @@ ], 'ament_copyright.license': [ 'apache2 = ament_copyright.licenses:apache2', - 'bsd2 = ament_copyright.licenses:bsd2', 'bsd_3clause = ament_copyright.licenses:bsd_3clause', 'mit = ament_copyright.licenses:mit', 'gplv3 = ament_copyright.licenses:gplv3',