From commits-return-10726-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Thu Aug 20 21:25:57 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@locus.apache.org Delivered-To: apmail-jmeter-commits-archive@locus.apache.org Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with ESMTP id B43011AE18 for ; Thu, 20 Aug 2020 21:25:56 +0000 (UTC) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 60CA412544F for ; Thu, 20 Aug 2020 21:25:56 +0000 (UTC) Received: (qmail 79213 invoked by uid 500); 20 Aug 2020 21:25:56 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 79182 invoked by uid 500); 20 Aug 2020 21:25:56 -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 79173 invoked by uid 99); 20 Aug 2020 21:25:56 -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 Aug 2020 21:25:56 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8E923890B8; Thu, 20 Aug 2020 21:25:55 +0000 (UTC) Date: Thu, 20 Aug 2020 21:25:55 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159795875529.27532.8948783448825980929@gitbox.apache.org> From: vladimirsitnikov@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: 769a2a1b68d4f963bd38c0f706997b2f5bb875b0 X-Git-Newrev: a0ed3e0e0c205257f25d359e2c7df91847f815c7 X-Git-Rev: a0ed3e0e0c205257f25d359e2c7df91847f815c7 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. vladimirsitnikov 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 a0ed3e0 Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1) a0ed3e0 is described below commit a0ed3e0e0c205257f25d359e2c7df91847f815c7 Author: Vladimir Sitnikov AuthorDate: Fri Aug 21 00:25:38 2020 +0300 Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1) --- build.gradle.kts | 22 +++++++++++++++++----- gradle.properties | 2 +- xdocs/changes.xml | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6eb8d38..2bbc5f4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -187,11 +187,15 @@ sonarqube { } } -fun SonarQubeProperties.add(name: String, value: String) { - properties.getOrPut(name) { mutableSetOf() } +fun SonarQubeProperties.add(name: String, valueProvider: () -> String) { + properties.getOrPut(name) { mutableSetOf() } .also { @Suppress("UNCHECKED_CAST") - (it as MutableCollection).add(value) + (it as MutableCollection).add(object { + // SonarQube calls toString when converting properties to values + // (see SonarQubeProperties), so we use that to emulate "lazy properties" + override fun toString() = valueProvider() + }) } } @@ -238,7 +242,11 @@ if (enableSpotBugs) { sonarqube { properties { spotBugTasks.configureEach { - add("sonar.java.spotbugs.reportPaths", reports.named("xml").get().destination.toString()) + add("sonar.java.spotbugs.reportPaths") { + // Note: report is created with lower-case xml, and then + // the created entry MUST be retrieved as upper-case XML + reports.named("XML").get().destination.toString() + } } } } @@ -528,7 +536,11 @@ allprojects { description = "$description (skipped by default, to enable it add -Dspotbugs)" } reports { - create(if (reportsForHumans()) "html" else "xml") + // xml goes for SonarQube, so we always create it just in case + create("xml") + if (reportsForHumans()) { + create("html") + } } enabled = enableSpotBugs } diff --git a/gradle.properties b/gradle.properties index 30fd04d..7636b6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,7 +45,7 @@ com.github.vlsi.checksum-dependency.version=1.70 com.github.vlsi.vlsi-release-plugins.version=1.70 org.jetbrains.gradle.plugin.idea-ext.version=0.5 org.nosphere.apache.rat.version=0.5.3 -org.sonarqube.version=2.7.1 +org.sonarqube.version=3.0 # Dependencies accessors-smart.version=1.2 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 9f573ac..0efdc28 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -135,6 +135,7 @@ applications when JMeter is starting up.

  • 612Correct typos in README.me. Based on patches by Pooja Chandak (poojachandak002 at gmail.com)
  • 613Add documentation for Darklaf properties. Jannis Weis
  • Update SpotBugs to 4.1.2 (from 4.1.1), upgrade spotbugs-gradle-plugin to 4.5.0 (from 2.0.0)
    • +
  • Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1)