jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject [jmeter] branch master updated: Add license override for hamcrest 2.2
Date Sun, 16 Feb 2020 20:27:52 GMT
This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new ca422a3  Add license override for hamcrest 2.2
ca422a3 is described below

commit ca422a3c5275f6645647af6f05ca50ff295b93b8
Author: Felix Schumacher <felix.schumacher@internetallee.de>
AuthorDate: Sun Feb 16 21:27:39 2020 +0100

    Add license override for hamcrest 2.2
---
 src/licenses/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index f2921ad..459934b 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -166,7 +166,7 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class)
{
         effectiveLicense = SpdxLicense.Apache_2_0
     }
     for (lib in listOf("hamcrest-core", "hamcrest")) {
-        overrideLicense("org.hamcrest:$lib:2.1") {
+        overrideLicense("org.hamcrest:$lib:2.2") {
             // https://github.com/hamcrest/JavaHamcrest/issues/264
             // pom.xml lists "New BSD License", however it is BSD_3
             expectedLicense = SpdxLicense.BSD_3_Clause


Mime
View raw message