From commits-return-10441-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Thu Feb 20 21:39:59 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 3602C19212 for ; Thu, 20 Feb 2020 21:39:59 +0000 (UTC) Received: (qmail 92529 invoked by uid 500); 20 Feb 2020 21:39:58 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 92493 invoked by uid 500); 20 Feb 2020 21:39:58 -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 92484 invoked by uid 99); 20 Feb 2020 21:39:58 -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:39:58 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 79A328DACA; Thu, 20 Feb 2020 21:39:58 +0000 (UTC) Date: Thu, 20 Feb 2020 21:39:58 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Updated slf4j to 1.7.30 (from 1.7.28) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158223479840.22988.12968552049216231466@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: 60dc06d6994df216eaf2f067dc3c5ceb117a2a09 X-Git-Newrev: b7e9d01a3abe78093e70eb641ca254750b460b40 X-Git-Rev: b7e9d01a3abe78093e70eb641ca254750b460b40 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 b7e9d01 Updated slf4j to 1.7.30 (from 1.7.28) b7e9d01 is described below commit b7e9d01a3abe78093e70eb641ca254750b460b40 Author: Felix Schumacher AuthorDate: Thu Feb 20 22:39:31 2020 +0100 Updated slf4j to 1.7.30 (from 1.7.28) --- gradle.properties | 2 +- src/licenses/build.gradle.kts | 6 +++--- xdocs/changes.xml | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c23be4..84f4fbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -110,7 +110,7 @@ ph-css.version=6.2.0 rhino.version=1.7.11 rsyntaxtextarea.version=3.0.4 Saxon-HE.version=9.9.1-5 -slf4j.version=1.7.28 +slf4j.version=1.7.30 spock-core.version=1.2-groovy-2.4 springframework.version=4.3.17.RELEASE tika.version=1.22 diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts index 459934b..ff02fee 100644 --- a/src/licenses/build.gradle.kts +++ b/src/licenses/build.gradle.kts @@ -137,13 +137,13 @@ val gatherBinaryLicenses by tasks.registering(GatherLicenseTask::class) { expectedLicense = SpdxLicense.MIT } - overrideLicense("org.slf4j:jcl-over-slf4j:1.7.28") { + overrideLicense("org.slf4j:jcl-over-slf4j:1.7.30") { expectedLicense = SpdxLicense.MIT - // See https://github.com/qos-ch/slf4j/blob/v_1.7.28/jcl-over-slf4j/LICENSE.txt + // 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.28") { + overrideLicense("org.slf4j:slf4j-api:1.7.30") { expectedLicense = SpdxLicense.MIT } diff --git a/xdocs/changes.xml b/xdocs/changes.xml index b84eb6e..9605c19 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -145,6 +145,7 @@ to view the last release notes of version 5.2.1.
  • Updated Apache log4j to 2.13.0 (from 2.12.1)
  • Updated junit4 to 4.13 (from 4.12)
  • Updated junit5 to 5.6.0 (from 5.5.1)
    • +
  • Updated slf4j to 1.7.30 (from 1.7.28)