From bd343b1e9cf7fa5a5ae8fcbc556a6fbe14d233fa Mon Sep 17 00:00:00 2001 From: Binit Shah Date: Tue, 28 Sep 2021 10:40:02 -0700 Subject: [PATCH] Switch Stretch Description to BSD 3-Clause Clear license --- README.md | 2 +- stretch_description/LICENSE.md | 35 ++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 24f05ca..d29d93d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ stretch_calibration | [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html) stretch_core | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) stretch_deep_perception | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) stretch_demos | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) -stretch_description | [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/) +stretch_description | [BSD 3-Clause Clear License](https://choosealicense.com/licenses/bsd-3-clause-clear/) stretch_funmap | [LGPLv3](https://www.gnu.org/licenses/lgpl-3.0.en.html) stretch_gazebo | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) stretch_moveit_config | [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/stretch_description/LICENSE.md b/stretch_description/LICENSE.md index beef7eb..a97028e 100644 --- a/stretch_description/LICENSE.md +++ b/stretch_description/LICENSE.md @@ -1,13 +1,36 @@ The following license applies to the entire contents of this directory (the "Contents"). The Contents consist of software and data used with the Stretch RE1 mobile manipulator, which is a robot produced and sold by Hello Robot Inc. -Copyright 2020 Hello Robot Inc. +--- -The Contents are licensed under the Creative Commons Attribution-NonCommercial-ShareAlike-4.0-International (CC BY-NC-SA 4.0) license (the "License"); you may not use the Contents except in compliance with the License. You may obtain a copy of the License at +The Clear BSD License -https://creativecommons.org/licenses/by-nc-sa/4.0/ +Copyright (c) 2021 Hello Robot Inc. +All rights reserved. -Unless required by applicable law or agreed to in writing, the Contents distributed under the License are 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. +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the disclaimer +below) provided that the following conditions are met: -Patents pending and trademark rights cover the Contents. As stated by the detailed License, "Patent and trademark rights are not licensed under this Public License." + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. -For further information about the Contents including inquiries about dual licensing, please contact Hello Robot Inc. + * 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. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY +THIS LICENSE. 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.