Skip to content

Commit

Permalink
Fix licence and add correct SPDX licence identifier (#414)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
tumbarumba and vlsi authored Jul 23, 2024
1 parent 1d5e931 commit ad5c9f2
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 28 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.

27 changes: 0 additions & 27 deletions LICENSE.txt

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
1 change: 1 addition & 0 deletions hamcrest/hamcrest.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,' +
Expand Down

0 comments on commit ad5c9f2

Please sign in to comment.