[jmeter] branch master updated (c5a7888 -> 98e8022)

[vl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from c5a7888  Bump release plugins 1.43.0 -> 1.46.0: avoid failures on Gralde upgrade, fix gitignore handling
     new 14b5246  Use the official Gradle 6.0.1 release
     new 98e8022  Exclude bin/rmi_keystore.jks from the binary distribution

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 src/dist/build.gradle.kts                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

[jmeter] 01/02: Use the official Gradle 6.0.1 release

[vl...@apache.org]

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

commit 14b52466658c1ba5c64c29f6cb668f051fa01a88
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Nov 19 23:57:02 2019 +0300

    Use the official Gradle 6.0.1 release
---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d442bc..c571965 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=689725c21af80d7f3da75b946b05567a60783c73eeb8fce2c6014723a4ce024a
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0.1-20191115103811+0000-all.zip
+distributionSha256Sum=6f6cfdbb12a577c3845522a1c7fbfe1295ea05d87edabedd4e23fd2bf02b88b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

[jmeter] 02/02: Exclude bin/rmi_keystore.jks from the binary distribution

[vl...@apache.org]

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

commit 98e8022b224c4b418ab3a9844e68d6ca23551ec4
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Nov 20 00:01:17 2019 +0300

    Exclude bin/rmi_keystore.jks from the binary distribution
---
 src/dist/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 98c537e..ff9a90f 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -403,6 +403,7 @@ fun CrLfSpec.binaryLayout() = copySpec {
         from(rootDir) {
             gitignore(gitProps)
             exclude("bin/testfiles")
+            exclude("bin/rmi_keystore.jks")
             include("bin/**")
             include("lib/ext/**")
             include("lib/junit/**")