From commits-return-10724-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Thu Aug 20 18:40:07 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@locus.apache.org Delivered-To: apmail-jmeter-commits-archive@locus.apache.org Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by minotaur.apache.org (Postfix) with ESMTP id 29C021A95F for ; Thu, 20 Aug 2020 18:40:07 +0000 (UTC) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id DAD83419E6 for ; Thu, 20 Aug 2020 18:40:06 +0000 (UTC) Received: (qmail 43195 invoked by uid 500); 20 Aug 2020 18:40:06 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 43159 invoked by uid 500); 20 Aug 2020 18:40:06 -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 43150 invoked by uid 99); 20 Aug 2020 18:40:06 -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 18:40:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7E871890B8; Thu, 20 Aug 2020 18:40:06 +0000 (UTC) Date: Thu, 20 Aug 2020 18:40:06 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Fix Gradle warnings: duplicate entries in processResources, compile configuration MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159794880639.4159.6486260073790408646@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: 90ddca3b76e940dbb91e4bd281fffe476c8e4a7d X-Git-Newrev: 9acded5a7a06c7839d021edb9012e6dce5ea7371 X-Git-Rev: 9acded5a7a06c7839d021edb9012e6dce5ea7371 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 9acded5 Fix Gradle warnings: duplicate entries in processResources, compile configuration 9acded5 is described below commit 9acded5a7a06c7839d021edb9012e6dce5ea7371 Author: Vladimir Sitnikov AuthorDate: Thu Aug 20 21:39:36 2020 +0300 Fix Gradle warnings: duplicate entries in processResources, compile configuration --- build.gradle.kts | 26 +++++++++------------- .../subprojects/batchtest/batchtest.gradle.kts | 2 +- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ecf804f..6eb8d38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -462,21 +462,17 @@ allprojects { options.encoding = "UTF-8" } withType().configureEach { - from(source) { - include("**/*.properties") - filteringCharset = "UTF-8" - // apply native2ascii conversion since Java 8 expects properties to have ascii symbols only - filter(org.apache.tools.ant.filters.EscapeUnicode::class) - filter(LineEndings.LF) - } - // Text-like resources are normalized to LF (just for consistency purposes) - // This makes to produce exactly the same jar files no matter which OS is used for the build - from(source) { - include("**/*.dtd") - include("**/*.svg") - include("**/*.txt") - filteringCharset = "UTF-8" - filter(LineEndings.LF) + filteringCharset = "UTF-8" + eachFile { + if (name.endsWith(".properties")) { + filteringCharset = "UTF-8" + // apply native2ascii conversion since Java 8 expects properties to have ascii symbols only + filter(org.apache.tools.ant.filters.EscapeUnicode::class) + filter(LineEndings.LF) + } else if (name.endsWith(".dtd") || name.endsWith(".svg") || + name.endsWith(".txt")) { + filter(LineEndings.LF) + } } } afterEvaluate { diff --git a/buildSrc/subprojects/batchtest/batchtest.gradle.kts b/buildSrc/subprojects/batchtest/batchtest.gradle.kts index 83ad498..3c8b01e 100644 --- a/buildSrc/subprojects/batchtest/batchtest.gradle.kts +++ b/buildSrc/subprojects/batchtest/batchtest.gradle.kts @@ -17,7 +17,7 @@ */ dependencies { - compile("org.ajoberstar.grgit:grgit-gradle:3.1.1") + implementation("org.ajoberstar.grgit:grgit-gradle:3.1.1") } gradlePlugin {