From commits-return-10442-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Thu Feb 20 21:55:39 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id 19EF519281 for ; Thu, 20 Feb 2020 21:55:39 +0000 (UTC) Received: (qmail 11969 invoked by uid 500); 20 Feb 2020 21:55:38 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 11944 invoked by uid 500); 20 Feb 2020 21:55:38 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 11935 invoked by uid 99); 20 Feb 2020 21:55:38 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Feb 2020 21:55:38 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 63E5D8DACA; Thu, 20 Feb 2020 21:55:38 +0000 (UTC) Date: Thu, 20 Feb 2020 21:55:38 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: License overrides for asm and jcl-over-slf4j are not needed anymore MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158223573831.5019.5733067339033236518@gitbox.apache.org> From: fschumacher@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b7e9d01a3abe78093e70eb641ca254750b460b40 X-Git-Newrev: 41c6dc85053167c6c06a30b5110387752b92051c X-Git-Rev: 41c6dc85053167c6c06a30b5110387752b92051c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 }