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 443b549 Update Gradle to 7.2
443b549 is described below
commit 443b549fca5c135940b0a26bf0b2be261f0f0925
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Fri Oct 15 22:10:24 2021 +0300
Update Gradle to 7.2
---
buildSrc/checksum.xml | 10 +++++++++-
.../kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt | 2 +-
.../org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
settings.gradle.kts | 2 ++
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 4e383fa..2474daa 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -8,8 +8,12 @@
<trusted-key id='105cb91cac2aee0e' group='com.github.autostyle' />
<trusted-key id='62c82e50836eb3ee' group='com.github.gundy' />
<trusted-key id='461a804f2609fd89' group='com.github.shyiko.klob' />
+ <trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
<trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
+ <trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
<trusted-key id='abe9f3126bb741c1' group='com.google.guava' />
+ <trusted-key id='f6d4a1d411e9d1ae' group='com.google.guava' />
+ <trusted-key id='29579f18fa8fd93b' group='com.google.j2objc' />
<trusted-key id='7eb97d110dfadd60' group='com.googlecode.concurrent-trees'
/>
<trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
<trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
@@ -27,14 +31,15 @@
<trusted-key id='c7bf26d0bb617866' group='org.apache.maven' />
<trusted-key id='e2b3d84202b812d9' group='org.assertj' />
<trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
+ <trusted-key id='b16698a4adf4d638' group='org.checkerframework' />
<trusted-key id='41321490758aad6f' group='org.codehaus.groovy' />
<trusted-key id='466caed6e0747d50' group='org.codehaus.plexus' />
<trusted-key id='0e91c2de43b72bb1' group='org.ec4j.core' />
<trusted-key id='c7bf26d0bb617866' group='org.eclipse.aether' />
<trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
<trusted-key id='a6adfc93ef34893e' group='org.hamcrest' />
- <trusted-key id='bcf4173966770193' group='org.jetbrains' />
<trusted-key id='379ce192d401ab61' group='org.jetbrains' />
+ <trusted-key id='bcf4173966770193' group='org.jetbrains' />
<trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
<trusted-key id='6a0975f8b1127b83' group='org.jetbrains.kotlin' />
<trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
@@ -48,6 +53,9 @@
<dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='2.1.4'>
<sha512>A343D64A4A607CD30B8464391FA542CDD11B3CAE65A589134DFADF298867B938A79CB752EC709614CB9F2E3080341936FDD40223EBFE414399D0FDAF15ACD358</sha512>
</dependency>
+ <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='2.1.6'>
+
<sha512>59E0C00C153296770FD8ED56CF0B2BDC2C5525557562C63D035E6E325557734940CDC5882407D93AD29C20727CA8C85BC9C50A683B62F67484A9BBE608F26A46</sha512>
+ </dependency>
<dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
<sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
</dependency>
diff --git
a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
index 22fba7d..95daf99 100644
---
a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
+++
b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/BatchTest.kt
@@ -112,7 +112,7 @@ open class BatchTest @Inject constructor(objects:
ObjectFactory) : JavaExec() {
group = BATCH_TESTS_GROUP_NAME
description = "Runs jmx file via process fork and verifies outputs"
workingDir = File(project.rootDir, "bin")
- main = "org.apache.jmeter.NewDriver"
+ mainClass.set("org.apache.jmeter.NewDriver")
classpath(jmeterJar)
// This does not depend on the task configuration, so the properties
are initialized early
diff --git
a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
index ca36eb2..4be2740 100644
---
a/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
+++
b/buildSrc/subprojects/batchtest/src/main/kotlin/org/apache/jmeter/buildtools/batchtest/WriterExtensions.kt
@@ -24,7 +24,7 @@ import java.io.Writer
fun Writer.withPrefix(prefix: String) =
LineBufferingOutputStream(object : TextStream {
- override fun text(text: String?) {
+ override fun text(text: String) {
write(prefix)
write(text)
flush()
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index aa357df..c8c7da1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2bf4381..6c290f5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -133,6 +133,8 @@ val expectedSha512 = mapOf(
"2A01A91008DF02AA0256D64EAB9238B23B85EA2A886E024E07C3880D642C5E4B96E66DE0D90832BCCEFE5F7C8EF045EBB9905B2A74398E38FAD6A5B28BEBA54D"
to "gradle-enterprise-gradle-plugin-3.6.jar",
"43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
+ to "gradle-enterprise-gradle-plugin-3.6.3.jar",
+
"FA305ACAAF45D005F5032D93C4F37CD097936C802943885A8F2B9EC27DA24F148DB41748655347C9A707C62614087432B3D32CC1B297381D45F3D8063BFFFA6D"
to "bcpg-jdk15on-1.62.jar",
"2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
to "bcprov-jdk15on-1.62.jar",
