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 e8fa76aabd chore(deps): update Gradle to v8.4
e8fa76aabd is described below
commit e8fa76aabd5cbb45bd98307ac4cad073a1f353a7
Author: Mend Renovate <[email protected]>
AuthorDate: Fri Nov 24 12:13:38 2023 +0000
chore(deps): update Gradle to v8.4
Fixes https://github.com/apache/jmeter/pull/6121
---
build-logic/checksum.xml | 4 +--
.../jvm/src/main/kotlin/build-logic.jmh.gradle.kts | 4 +--
.../main/kotlin/build-logic.checkstyle.gradle.kts | 2 +-
checksum.xml | 4 +--
gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 63721 bytes
gradle/wrapper/gradle-wrapper.properties | 5 ++--
gradlew | 29 ++++++++++++---------
src/core/build.gradle.kts | 4 +--
src/dist/build.gradle.kts | 23 ++++++++--------
src/licenses/build.gradle.kts | 8 +++---
10 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/build-logic/checksum.xml b/build-logic/checksum.xml
index 8421fe8b9b..08f4a65f57 100644
--- a/build-logic/checksum.xml
+++ b/build-logic/checksum.xml
@@ -101,8 +101,8 @@
<dependency group='org.codehaus.groovy.modules.http-builder'
module='http-builder' version='0.7.1'>
<sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
</dependency>
- <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='4.0.7'>
-
<sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+ <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='4.1.2'>
+
<sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
</dependency>
<dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin'
version='1.8.10'>
<sha512>5BA8B33D023D112BCF170B49CF66610A1A3EB3DEBF0D028065E89AE40B23C55380D329B354E1698B44912FA78935294B9F7584AFA6FCE995F12CE1D1D0A329FC</sha512>
diff --git a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
index bd176572c4..f0efe81f3f 100644
--- a/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/build-logic.jmh.gradle.kts
@@ -72,7 +72,7 @@ tasks.withType<JavaExec>().configureEach {
// At best jmh plugin should add the generated directories to the
Gradle model, however,
// currently it builds the jar only :-/
// IntelliJ IDEA "execute main method" adds a JavaExec task, so we
configure it
- classpath(File(buildDir, "jmh-generated-classes"))
- classpath(File(buildDir, "jmh-generated-resources"))
+ classpath(layout.buildDirectory.dir("jmh-generated-classes"))
+ classpath(layout.buildDirectory.dir("jmh-generated-resources"))
}
}
diff --git
a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
index 66b033db16..44ef221da6 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.checkstyle.gradle.kts
@@ -29,7 +29,7 @@ checkstyle {
toolVersion = "10.12.5"
configProperties = mapOf(
- "cache_file" to
buildDir.resolve("checkstyle/cacheFile").relativeTo(configDir)
+ "cache_file" to
layout.buildDirectory.dir("checkstyle/cacheFile").get().asFile.relativeTo(configDir)
)
providers.gradleProperty("checkstyle.version")
diff --git a/checksum.xml b/checksum.xml
index cebb72b593..1546c6c565 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -309,8 +309,8 @@
<dependency group='org.codehaus.groovy.modules.http-builder'
module='http-builder' version='0.7.1'>
<sha512>BC7BC2A514F8CA104A392ECF8736F4A3D316EE988FA91299D33B0AF46134B38E14E4A5061449D17B2DF7A521643E6C02DFA37CC277ED7CAB7CE83C28C00E9719</sha512>
</dependency>
- <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='4.0.7'>
-
<sha512>2304C8B72245837B42332431311970083BF0E03CA13128808AD8B4739ECDCDC43BF089256F6ED29BFD31FE859DA76BBA3FB61737EF0B8A380C75AA67AF7A8382</sha512>
+ <dependency group='org.gradle.kotlin' module='gradle-kotlin-dsl-plugins'
version='4.1.2'>
+
<sha512>B23C4355CBAB2098506528D196F6C9A71D4689F4A3334494B97D9F6D868883D429D851FC319761C25ACC86F0C4E02F028B33C1868B6EF7BA1246E3D79ADF1582</sha512>
</dependency>
<dependency group='org.jetbrains.kotlin' module='kotlin-gradle-plugin'
version='1.8.21'>
<sha512>09D6B646399888DBD6498D24C2B6FABBEF49444FD0710E8F93FE266FFFD11A4A2C1CFEE3431D52AD03CA781E2EFAB60896DCA53AE56924AA0C48F9C85FCE66BB</sha512>
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa7..7f93135c49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index e277e34d47..d5a7c2d41e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,8 +17,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=0336f591bc0ec9aa0c9988929b93ecc916b3c1d52aed202c7381db144aa0ef15
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
+validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set
(https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no
'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found
in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
+ fi
fi
# Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is
checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is
checked to see if it worked.
- # shellcheck disable=SC3045
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not
allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is
an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index 800cefd3c9..43da5c77e8 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -129,7 +129,7 @@ dependencies {
testFixturesImplementation("org.junit.jupiter:junit-jupiter")
}
-val generatedVersionDir = File(buildDir, "generated/sources/version")
+val generatedVersionDir = layout.buildDirectory.dir(
"generated/sources/version")
val versionClass by tasks.registering(Sync::class) {
val lastEditYear: String by rootProject.extra
@@ -152,7 +152,7 @@ val versionClass by tasks.registering(Sync::class) {
// Caused by: java.lang.IllegalStateException: couldn't find inline method
//
Lorg/gradle/kotlin/dsl/Accessorslkzxmv806rumtqvft7195qyhKt;.getIde(Lorg/gradle/api/Project;)Lcom/github/vlsi/gradle/ide/IdeExtension;
configure<IdeExtension> {
- generatedJavaSources(versionClass.get(), generatedVersionDir)
+ generatedJavaSources(versionClass.get(), generatedVersionDir.get().asFile)
}
// <editor-fold defaultstate="collapsed" desc="Gradle can't infer task
dependencies, however it sees they use the same directories. So we add the
dependencies">
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index a41d732dd7..ed40ea3dee 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -166,7 +166,7 @@ val verifyReleaseDependencies by tasks.registering {
val expectedLibs = file("src/dist/expected_release_jars.csv")
inputs.file(expectedLibs)
inputs.property("updateExpectedJars", updateExpectedJars)
- val actualLibs = File(buildDir, "dist/expected_release_jars.csv")
+ val actualLibs =
layout.buildDirectory.file("dist/expected_release_jars.csv")
outputs.file(actualLibs)
val ignoreJarsMismatch = version.toString().endsWith("-SNAPSHOT")
if (ignoreJarsMismatch || updateExpectedJars) {
@@ -233,12 +233,13 @@ val verifyReleaseDependencies by tasks.registering {
sb.append(" ").append(dep)
}
val newline = System.getProperty("line.separator")
- actualLibs.writeText(
+ val actualLibsFile = actualLibs.get().asFile
+ actualLibsFile.writeText(
libs.map { "${it.value},${it.key}" }.joinToString(newline, postfix
= newline)
)
if (updateExpectedJars) {
println("Updating ${expectedLibs.relativeTo(rootDir)}")
- actualLibs.copyTo(expectedLibs, overwrite = true)
+ actualLibsFile.copyTo(expectedLibs, overwrite = true)
} else if (ignoreJarsMismatch) {
// Renovate requires self-hosted runner for executing
postUpgradeTasks,
// so we can't make Renovate to update expected_release_jars.csv
at the moment
@@ -315,13 +316,13 @@ fun createAnakiaTask(
excludes: Array<String>,
includes: Array<String>
): TaskProvider<Task> {
- val outputDir = "$buildDir/docs/$taskName"
+ val outputDir = layout.buildDirectory.dir("docs/$taskName").get().asFile
val prepareProps = tasks.register("prepareProperties$taskName") {
// AnakiaTask can't use relative paths, and it forbids ../, so we
create a dedicated
// velocity.properties file that contains absolute path
inputs.file(velocityProperties)
- val outputProps = "$buildDir/docProps/$taskName/velocity.properties"
+ val outputProps =
layout.buildDirectory.file("docProps/$taskName/velocity.properties").get().asFile
outputs.file(outputProps)
doLast {
// Unfortunately, Velocity does not use Java properties format.
@@ -428,7 +429,7 @@ val buildPrintableDoc = createAnakiaTask(
val previewPrintableDocs by tasks.registering(Copy::class) {
group = JavaBasePlugin.DOCUMENTATION_GROUP
description = "Creates preview of a printable documentation to
build/docs/printable_preview"
- into("$buildDir/docs/printable_preview")
+ into(layout.buildDirectory.dir("docs/printable_preview"))
CrLfSpec().run {
gitattributes(gitProps)
printableDocumentation()
@@ -461,7 +462,7 @@ fun xslt(
}
val processSiteXslt by tasks.registering {
- val outputDir = "$buildDir/siteXslt"
+ val outputDir = layout.buildDirectory.dir("siteXslt").get().asFile
inputs.files(xdocs).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
inputs.property("year", lastEditYear)
outputs.dir(outputDir)
@@ -472,7 +473,7 @@ val processSiteXslt by tasks.registering {
f.delete()
}
for (i in arrayOf("", "usermanual", "localising")) {
- xslt(i, outputDir)
+ xslt(i, outputDir.absolutePath)
}
}
}
@@ -489,7 +490,7 @@ fun CopySpec.siteLayout() {
}
// See https://github.com/gradle/gradle/issues/10960
-val previewSiteDir = buildDir.resolve("site")
+val previewSiteDir = layout.buildDirectory.dir("site")
val previewSite by tasks.registering(Sync::class) {
group = JavaBasePlugin.DOCUMENTATION_GROUP
description = "Creates preview of a site to build/docs/site"
@@ -499,7 +500,7 @@ val previewSite by tasks.registering(Sync::class) {
siteLayout()
}
doLast {
- println("Site preview synchronized to $previewSiteDir/index.html")
+ println("Site preview synchronized to
${previewSiteDir.get().file("index.html")}")
}
}
@@ -576,7 +577,7 @@ val javadocAggregate by tasks.registering(Javadoc::class) {
// Aggregate javadoc needs to include generated JMeterVersion class
// So we use delay computation of source files
setSource(sourceSets.map { set -> set.map { it.allJava } })
- setDestinationDir(file("$buildDir/docs/javadocAggregate"))
+
setDestinationDir(layout.buildDirectory.dir("docs/javadocAggregate").get().asFile)
}
// Generates distZip, distTar, distZipSource, and distTarSource tasks
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index f1b45341e1..e229246786 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -211,20 +211,20 @@ val binLicenseSpec =
licensesCopySpec(renderLicenseForBinary)
val srcLicenseSpec = licensesCopySpec(renderLicenseForSource)
val binLicenseDir by tasks.registering(Sync::class) {
- into("$buildDir/$name")
+ into(layout.buildDirectory.dir(name))
dependencyLicenses(binLicenseSpec)
}
val srcLicenseDir by tasks.registering(Sync::class) {
- into("$buildDir/$name")
+ into(layout.buildDirectory.dir(name))
dependencyLicenses(srcLicenseSpec)
}
artifacts {
- add(binLicense.name, buildDir.resolve(binLicenseDir.name)) {
+ add(binLicense.name, layout.buildDirectory.dir(binLicenseDir.name)) {
builtBy(binLicenseDir)
}
- add(srcLicense.name, buildDir.resolve(srcLicenseDir.name)) {
+ add(srcLicense.name, layout.buildDirectory.dir(srcLicenseDir.name)) {
builtBy(srcLicenseDir)
}
}
