From ad5c9f2eb1fd19ff798eeb5d5ba5109075c50176 Mon Sep 17 00:00:00 2001 From: Joe Schmetzer Date: Tue, 23 Jul 2024 16:11:27 +1000 Subject: [PATCH] Fix licence and add correct SPDX licence identifier (#414) * Moved LICENSE.txt to the more standard LICENCE, ensuring the text is the same as the canonical version at https://opensource.org/license/BSD-3-Clause * Used the correct SPDX license identifier in the Bundle-License field in the manifest, as well as the pom * Used the correct SPDX license identifier in the pom Co-authored-by: Vladimir Sitnikov --- CHANGES.md | 4 ++++ LICENSE | 29 +++++++++++++++++++++++++++++ LICENSE.txt | 27 --------------------------- build.gradle | 2 +- hamcrest/hamcrest.gradle | 1 + 5 files changed, 35 insertions(+), 28 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.txt diff --git a/CHANGES.md b/CHANGES.md index 840cef1f..c15e9034 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ * Java 1.8 or newer ([Issue #331](https://github.com/hamcrest/JavaHamcrest/issues/331), [PR #411](https://github.com/hamcrest/JavaHamcrest/issues/411)). * FileMatchersTest simplification ([PR #389](https://github.com/hamcrest/JavaHamcrest/issues/389)) +* License cleanup ([PR #414](https://github.com/hamcrest/JavaHamcrest/issues/414), +see also [#264](https://github.com/hamcrest/JavaHamcrest/issues/264), +[#355](https://github.com/hamcrest/JavaHamcrest/issues/355), and +[#399](https://github.com/hamcrest/JavaHamcrest/issues/399)) TBD diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..5a57af22 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2000-2024, www.hamcrest.org + +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. + +3. 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 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/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 1b869027..00000000 --- a/LICENSE.txt +++ /dev/null @@ -1,27 +0,0 @@ -BSD License - -Copyright (c) 2000-2015 www.hamcrest.org -All rights reserved. - -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 Hamcrest 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/build.gradle b/build.gradle index 4786819c..67b98d6f 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ def pomConfigurationFor(String pomName, String pomDescription) { licenses { license { - name = 'BSD License 3' + name = 'BSD-3-Clause' url = 'http://opensource.org/licenses/BSD-3-Clause' } } diff --git a/hamcrest/hamcrest.gradle b/hamcrest/hamcrest.gradle index 78eb9228..cec7c5a8 100644 --- a/hamcrest/hamcrest.gradle +++ b/hamcrest/hamcrest.gradle @@ -24,6 +24,7 @@ jar { bundle { bnd 'Bundle-Name': 'org.hamcrest', 'Bundle-SymbolicName': 'org.hamcrest', + 'Bundle-License': 'BSD-3-Clause', 'Import-Package': 'javax.xml.namespace; resolution:=optional,' + 'javax.xml.xpath;resolution:=optional,' + 'org.w3c.dom;resolution:=optional,' +