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 41c6dc8 License overrides for asm and jcl-over-slf4j are not needed
anymore
41c6dc8 is described below
commit 41c6dc85053167c6c06a30b5110387752b92051c
Author: Felix Schumacher <[email protected]>
AuthorDate: Thu Feb 20 22:54:29 2020 +0100
License overrides for asm and jcl-over-slf4j are not needed anymore
Both artifacts are released under Apache License 2 now
---
src/licenses/build.gradle.kts | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index ff02fee..0e022fe 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -110,12 +110,6 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
effectiveLicense = SpdxLicense.BSD_3_Clause
}
- overrideLicense("org.ow2.asm:asm:7.1") {
- // pom.xml lists license as BSD
- expectedLicense = SimpleLicense("BSD",
uri("http://asm.ow2.org/license.html";))
- effectiveLicense = SpdxLicense.BSD_3_Clause
- }
-
for (jodd in listOf("jodd-core", "jodd-lagarto", "jodd-log",
"jodd-props")) {
overrideLicense("org.jodd:$jodd:5.0.13") {
expectedLicense = SpdxLicense.BSD_2_Clause // SimpleLicense("The
BSD 2-Clause License", uri("http://jodd.org/license.html";))
@@ -137,12 +131,6 @@ val gatherBinaryLicenses by
tasks.registering(GatherLicenseTask::class) {
expectedLicense = SpdxLicense.MIT
}
- overrideLicense("org.slf4j:jcl-over-slf4j:1.7.30") {
- expectedLicense = SpdxLicense.MIT
- // See
https://github.com/qos-ch/slf4j/blob/v_1.7.30/jcl-over-slf4j/LICENSE.txt
- effectiveLicense = SpdxLicense.Apache_2_0
- }
-
overrideLicense("org.slf4j:slf4j-api:1.7.30") {
expectedLicense = SpdxLicense.MIT
}
