This is an automated email from the ASF dual-hosted git repository.
ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 348474e2ae MINOR: Upgrade to Gradle 7.5 (#12413)
348474e2ae is described below
commit 348474e2aee0767976bc5cfa8e42117cb41147ee
Author: Ismael Juma <ism...@juma.me.uk>
AuthorDate: Tue Jul 26 05:58:50 2022 -0700
MINOR: Upgrade to Gradle 7.5 (#12413)
Highlights:
* The default Scala Zinc version was updated from 1.3.5 to 1.6.1
* Multiple Checkstyle tasks may now run in parallel within a project
* Support for Java 18
* Much more responsive continuous builds on Windows and macOS
* Improved diagnostics for dependency resolution
Some of our tests require java.util and java.lang modules to be open,
so do it explicitly given the following Gradle bug fix:
> When running on Java 9+, Gradle no longer opens the java.base/java.util
> and java.base/java.lang JDK modules for all Test tasks. In some cases,
> this would cause code to pass during testing but fail at runtime.
Release notes: https://docs.gradle.org/7.5/release-notes.html
Reviewers: Manikumar Reddy <manikumar.re...@gmail.com>, Luke Chen
<show...@gmail.com>
---
build.gradle | 2 ++
gradle/dependencies.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index a85d429a04..cd76eef0a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,8 +66,10 @@ ext {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16))
defaultJvmArgs.addAll(
"--add-opens=java.base/java.io=ALL-UNNAMED",
+ "--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/java.nio.file=ALL-UNNAMED",
+ "--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
"--add-opens=java.base/java.util.regex=ALL-UNNAMED",
"--add-opens=java.base/java.util.stream=ALL-UNNAMED",
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 92c098851c..0cd41b3dc0 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -62,7 +62,7 @@ versions += [
checkstyle: "8.36.2",
commonsCli: "1.4",
dropwizardMetrics: "4.1.12.1",
- gradle: "7.4.2",
+ gradle: "7.5",
grgit: "4.1.1",
httpclient: "4.5.13",
easymock: "4.3",
@@ -119,7 +119,7 @@ versions += [
spotbugs: "4.2.2",
swaggerAnnotations: "2.2.0",
swaggerJaxrs2: "2.2.0",
- zinc: "1.3.5",
+ zinc: "1.6.1",
zookeeper: "3.6.3",
zstd: "1.5.2-1"
]
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index e1e0c8dc42..ef80eb5051 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionSha256Sum=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 685cc73b31..0c1e473f0c 100755
--- a/gradlew
+++ b/gradlew
@@ -118,7 +118,7 @@ esac
# Loop in case we encounter an error.
for attempt in 1 2 3; do
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
- if ! curl -s -S --retry 3 -L -o
"$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
"https://raw.githubusercontent.com/gradle/gradle/v7.4.2/gradle/wrapper/gradle-wrapper.jar";;
then
+ if ! curl -s -S --retry 3 -L -o
"$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
"https://raw.githubusercontent.com/gradle/gradle/v7.5.0/gradle/wrapper/gradle-wrapper.jar";;
then
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
# Pause for a bit before looping in case the server throttled us.
sleep 5
