Skip to content

Commit ad5c9f2

Browse files
tumbarumbavlsi
andauthored
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 <[email protected]>
1 parent 1d5e931 commit ad5c9f2

File tree

5 files changed

+35
-28
lines changed

5 files changed

+35
-28
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
* Java 1.8 or newer ([Issue #331](https://github.com/hamcrest/JavaHamcrest/issues/331), [PR #411](https://github.com/hamcrest/JavaHamcrest/issues/411)).
88
* FileMatchersTest simplification ([PR #389](https://github.com/hamcrest/JavaHamcrest/issues/389))
9+
* License cleanup ([PR #414](https://github.com/hamcrest/JavaHamcrest/issues/414),
10+
see also [#264](https://github.com/hamcrest/JavaHamcrest/issues/264),
11+
[#355](https://github.com/hamcrest/JavaHamcrest/issues/355), and
12+
[#399](https://github.com/hamcrest/JavaHamcrest/issues/399))
913

1014
TBD
1115

LICENSE

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
BSD 3-Clause License
2+
3+
Copyright (c) 2000-2024, www.hamcrest.org
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+

LICENSE.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def pomConfigurationFor(String pomName, String pomDescription) {
7474

7575
licenses {
7676
license {
77-
name = 'BSD License 3'
77+
name = 'BSD-3-Clause'
7878
url = 'http://opensource.org/licenses/BSD-3-Clause'
7979
}
8080
}

hamcrest/hamcrest.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jar {
2424
bundle {
2525
bnd 'Bundle-Name': 'org.hamcrest',
2626
'Bundle-SymbolicName': 'org.hamcrest',
27+
'Bundle-License': 'BSD-3-Clause',
2728
'Import-Package': 'javax.xml.namespace; resolution:=optional,' +
2829
'javax.xml.xpath;resolution:=optional,' +
2930
'org.w3c.dom;resolution:=optional,' +

0 commit comments

Comments
 (0)