From a7bd81cc2b4daeb95fb412b2e74ac0194d70b91f Mon Sep 17 00:00:00 2001 From: dejan2609 Date: Tue, 27 Apr 2021 23:50:19 +0200 Subject: [PATCH] KAFKA-12728: version upgrades: gradle (6.8.3 -->> 7.0.1) and gradle shadow plugin (6.1.0 -->> 7.0.0) details: * gradle upgrade: 6.8.3 -->> 7.0.1 ** https://github.com/gradle/gradle/releases/tag/v7.0.0 ** https://github.com/gradle/gradle/releases/tag/v7.0.1 * 'distributionSha256Sum' gradle property is included into 'gradle-wrapper.properties' file * gradle shadow plugin upgrade: 6.1.0 -->> 7.0.0 ** https://github.com/johnrengelman/shadow/releases/tag/7.0.0 --- build.gradle | 2 +- gradle/dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index e443d317e870..adb9819e683f 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ plugins { id "com.github.spotbugs" version '4.7.1' apply false id 'org.gradle.test-retry' version '1.2.1' apply false id 'org.scoverage' version '5.0.0' apply false - id 'com.github.johnrengelman.shadow' version '6.1.0' apply false + id 'com.github.johnrengelman.shadow' version '7.0.0' apply false } spotless { diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 788aad0f347a..1d7e19b24cdd 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -61,7 +61,7 @@ versions += [ bcpkix: "1.66", checkstyle: "8.36.2", commonsCli: "1.4", - gradle: "6.8.3", + gradle: "7.0.1", grgit: "4.1.0", httpclient: "4.5.13", easymock: "4.3", diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5ad222..099f10061c9f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionSha256Sum=ca42877db3519b667cd531c414be517b294b0467059d401e7133f0e55b9bf265 +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 61d317e696d1..245b04e454de 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,8 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -81,7 +84,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/v6.8.3/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.0.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