You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/09/24 21:09:44 UTC
[jmeter] branch master updated: Upgrade to Gradle 5.6.1
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 fe4c14d Upgrade to Gradle 5.6.1
fe4c14d is described below
commit fe4c14d1b16a273d747d5e6d8f62664092003022
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Sep 25 00:05:01 2019 +0300
Upgrade to Gradle 5.6.1
---
buildSrc/checksum.xml | 9 +++++++++
.../jmeter/buildtools/batchtest/BatchTest.kt | 22 ++++++++++------------
gradle/wrapper/gradle-wrapper.properties | 4 ++--
src/build.gradle.kts | 3 +++
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index 64fa16f..75d18bc 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -3,19 +3,28 @@
<trust-requirement pgp='GROUP' checksum='NONE' />
<ignored-keys />
<trusted-keys>
+ <trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
<trusted-key id='72475fd306b9cab7' group='com.googlecode.javaewah' />
<trusted-key id='a50569c7ca7fa1f0' group='com.jcraft' />
+ <trusted-key id='86fdc7e2a11262cb' group='commons-codec' />
+ <trusted-key id='a41f13c999945293' group='commons-logging' />
+ <trusted-key id='6449005f96bc97a3' group='de.undercouch' />
<trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+ <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
<trusted-key id='b341ddb020fcb6ab' group='org.bouncycastle' />
<trusted-key id='5b05ccde140c2876' group='org.eclipse.jgit' />
<trusted-key id='bcf4173966770193' group='org.jetbrains' />
<trusted-key id='379ce192d401ab61' group='org.jetbrains.intellij.deps' />
<trusted-key id='98fe03a974ce0a0b' group='org.jetbrains.kotlin' />
+ <trusted-key id='379ce192d401ab61' group='org.jetbrains.kotlinx' />
<trusted-key id='2c7b12f2a511e325' group='org.slf4j' />
</trusted-keys>
<dependencies>
<dependency group='org.gradle.kotlin' module='plugins' version='1.2.8'>
<sha512>8EA1B7517CCCC6DD1A41CF0E88613F14548AF9052A0A8E1C68004F3B58A1D26B47A8BDA2D9F663213F59FCDBCEC4BE1A596D8B0B50013C7DD0276140D9DE3391</sha512>
</dependency>
+ <dependency group='org.gradle.kotlin' module='plugins' version='1.2.9'>
+ <sha512>F672FEB39919B2A78E0AEFA95E8BE023C856EA802FBB652EE97FF6BC935BB6E29B9E5E36CC62B9B52D970DE6C49AC0D07C1EC5588771FC2B89787AB94CAE6AC7</sha512>
+ </dependency>
</dependencies>
</dependency-verification>
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 8658bf7..bd4386f 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
@@ -107,18 +107,16 @@ open class BatchTest @Inject constructor(objects: ObjectFactory) : JavaExec() {
init {
group = BATCH_TESTS_GROUP_NAME
description = "Runs jmx file via process fork and verifies outputs"
- configure {
- workingDir = File(project.rootDir, "bin")
- main = "org.apache.jmeter.NewDriver"
- classpath(jmeterJar)
-
- // This does not depend on the task configuration, so the properties are initialized early
- // It enables to override the properties later (e.g. in the build script)
- maxHeapSize = "128m"
- jvmArgs("-Xss256k", "-XX:MaxMetaspaceSize=128m")
- systemProperty("java.rmi.server.hostname", InetAddress.getLocalHost().canonicalHostName)
- systemProperty("java.awt.headless", "true")
- }
+ workingDir = File(project.rootDir, "bin")
+ main = "org.apache.jmeter.NewDriver"
+ classpath(jmeterJar)
+
+ // This does not depend on the task configuration, so the properties are initialized early
+ // It enables to override the properties later (e.g. in the build script)
+ maxHeapSize = "128m"
+ jvmArgs("-Xss256k", "-XX:MaxMetaspaceSize=128m")
+ systemProperty("java.rmi.server.hostname", InetAddress.getLocalHost().canonicalHostName)
+ systemProperty("java.awt.headless", "true")
}
fun jmeterArgument(name: String, value: String) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b7ec98b..7e23290 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=6c4276f97c9059ef4dfb06cc7325c43ed9b933ab04f032e9d9372e8589cb6faf
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionSha256Sum=f6ea7f48e2823ca7ff8481044b892b24112f5c2c3547d4f423fb9e684c39f710
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/build.gradle.kts b/src/build.gradle.kts
index 3571bfe..e0fa7e4 100644
--- a/src/build.gradle.kts
+++ b/src/build.gradle.kts
@@ -43,6 +43,9 @@ subprojects {
apply<JacocoPlugin>()
dependencies {
+ val api by configurations
+ api(platform(project(":src:bom")))
+
if (!testsPresent) {
// No tests => no dependencies required
return@dependencies