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 3494d6eea34 MINOR: Upgrade gradle to 7.5.1 and bump other build/test
dependencies (#12495)
3494d6eea34 is described below
commit 3494d6eea34ceefc264d8b2a97f2874a9b8e72ae
Author: Ismael Juma <[email protected]>
AuthorDate: Wed Aug 10 06:07:54 2022 -0700
MINOR: Upgrade gradle to 7.5.1 and bump other build/test dependencies
(#12495)
Gradle 7.5.1:
* Important bug fixes including
https://github.com/gradle/gradle/issues/21400
* Release notes: https://docs.gradle.org/7.5.1/release-notes.html
JUnit 5.9.0
* Support for open test reporting and configurable thread mode for @Timeout
* Release notes:
https://junit.org/junit5/docs/current/release-notes/index.html#release-notes-5.9.0
test-retry-gradle-plugin 1.4.0
* Support for Gradle 7.6 and minor fixes
* Release notes:
* https://github.com/gradle/test-retry-gradle-plugin/releases/tag/v1.3.2
* https://github.com/gradle/test-retry-gradle-plugin/releases/tag/v1.4.0
spotbugs-gradle-plugin
* Minor fixes
* Release notes:
* https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.0.7
* https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.0.8
* https://github.com/spotbugs/spotbugs-gradle-plugin/releases/tag/5.0.9
dependency-check-gradle-plugin
* Minor improvements and false positive fixes
* Release notes:
* https://github.com/jeremylong/DependencyCheck/releases/tag/v7.0.4
* https://github.com/jeremylong/DependencyCheck/releases/tag/v7.1.0
rat-gradle-plugin
* Minor fixes
* Diff:
https://github.com/eskatos/creadur-rat-gradle/compare/v0.7.0...v0.7.1
Reviewers: Manikumar Reddy <[email protected]>
---
build.gradle | 8 ++++----
gradle/dependencies.gradle | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 8 +++++++-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/build.gradle b/build.gradle
index dd3f9cb2c9d..01da8cebc4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,11 +34,11 @@ plugins {
id 'com.github.ben-manes.versions' version '0.42.0'
id 'idea'
id 'java-library'
- id 'org.owasp.dependencycheck' version '7.0.3'
- id 'org.nosphere.apache.rat' version "0.7.0"
+ id 'org.owasp.dependencycheck' version '7.1.1'
+ id 'org.nosphere.apache.rat' version "0.7.1"
- id "com.github.spotbugs" version '5.0.6' apply false
- id 'org.gradle.test-retry' version '1.3.1' apply false
+ id "com.github.spotbugs" version '5.0.9' apply false
+ id 'org.gradle.test-retry' version '1.4.0' apply false
id 'org.scoverage' version '7.0.0' apply false
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id "io.swagger.core.v3.swagger-gradle-plugin" version "2.2.0"
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2a0220c1faa..7025d12eb54 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.5",
+ gradle: "7.5.1",
grgit: "4.1.1",
httpclient: "4.5.13",
easymock: "4.3",
@@ -81,7 +81,7 @@ versions += [
jfreechart: "1.0.0",
jopt: "5.0.4",
jose4j: "0.7.9",
- junit: "5.8.2",
+ junit: "5.9.0",
jqwik: "1.6.5",
kafka_0100: "0.10.0.1",
kafka_0101: "0.10.1.1",
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index ef80eb5051f..593bdcca0f3 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=97a52d145762adc241bad7fd18289bf7f6801e08ece6badf80402fe2b9f250b1
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionSha=db9c8211ed63f61f60292c69e80d89196f9eb36665e369e7f00ac4cc841c2219
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 0c1e473f0ce..3c53cb3fbb8 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.5.0/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.1/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
@@ -218,6 +218,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes
removed.
