doc: use SPDX license identifiers in pom.xml and in Bundle-License at…

…tribute Fixes hamcrest#264
vlsi · Apr 29, 2023 · 185b1bc · 185b1bc
1 parent e4b9afd
commit 185b1bc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -71,8 +71,10 @@ def pomConfigurationFor(String pomName, String pomDescription) {
 
         licenses {
             license {
-                name = 'BSD License 3'
-                url = 'http://opensource.org/licenses/BSD-3-Clause'
+                name = 'BSD-3-Clause'
+                // The file includes copyright text, so URL like http://opensource.org/licenses/BSD-3-Clause can't
+                // be used here.
+                url = 'https://raw.githubusercontent.com/hamcrest/JavaHamcrest/e4b9afdc2624bbebef3c7c739e6074ecd8a6c06e/LICENSE.txt'
             }
         }
 

diff --git a/hamcrest-core/hamcrest-core.gradle b/hamcrest-core/hamcrest-core.gradle
@@ -7,6 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
+                'Bundle-License': 'BSD-3-Clause',
                 'Automatic-Module-Name': 'org.hamcrest.core.deprecated'
     }
 }

diff --git a/hamcrest-library/hamcrest-library.gradle b/hamcrest-library/hamcrest-library.gradle
@@ -7,6 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
+                'Bundle-License': 'BSD-3-Clause',
                 'Automatic-Module-Name': 'org.hamcrest.library.deprecated'
     }
 }

diff --git a/hamcrest/hamcrest.gradle b/hamcrest/hamcrest.gradle
@@ -13,6 +13,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
+                'Bundle-License': 'BSD-3-Clause',
                 'Automatic-Module-Name': 'org.hamcrest'
         instruction 'Import-Package', '''javax.xml.namespace; resolution:=optional,
                                          javax.xml.xpath; resolution:=optional,