From 9033401943c4c445760b1a09c4c3df8de2e32cb3 Mon Sep 17 00:00:00 2001
From: dejan2609 <dejan2609@gmail.com>
Date: Tue, 27 Apr 2021 23:50:19 +0200
Subject: [PATCH] KAFKA-12728: version upgrades: gradle (6.8.3 -->> 7.0.2) and
 gradle shadow plugin (6.1.0 -->> 7.0.0)

details:
  * gradle upgrade: 6.8.3 -->> 7.0.2
      ** https://github.com/gradle/gradle/releases/tag/v7.0.0
      ** https://github.com/gradle/gradle/releases/tag/v7.0.1
      ** https://github.com/gradle/gradle/releases/tag/v7.0.2
  * '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
  * remaining configurations obsoleted in Gradle 6 (and removed in Gradle 7) are replaced:
      ** `compile` -->> `implementation`
      ** `testCompile` -->> `testImplementation`
---
 build.gradle                             | 16 ++++++++--------
 gradle/dependencies.gradle               |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  3 ++-
 gradlew                                  |  5 ++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index b10fc53eab3c6..94e521b9a3e17 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 {
@@ -842,15 +842,15 @@ project(':core') {
 
   configurations {
     // manually excludes some unnecessary dependencies
-    compile.exclude module: 'javax'
-    compile.exclude module: 'jline'
-    compile.exclude module: 'jms'
-    compile.exclude module: 'jmxri'
-    compile.exclude module: 'jmxtools'
-    compile.exclude module: 'mail'
+    implementation.exclude module: 'javax'
+    implementation.exclude module: 'jline'
+    implementation.exclude module: 'jms'
+    implementation.exclude module: 'jmxri'
+    implementation.exclude module: 'jmxtools'
+    implementation.exclude module: 'mail'
     // To prevent a UniqueResourceException due the same resource existing in both
     // org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
-    testCompile.exclude module: 'api-ldap-schema-data'
+    testImplementation.exclude module: 'api-ldap-schema-data'
   }
 
   tasks.create(name: "copyDependantLibs", type: Copy) {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2c67d137865f7..e8e5a79556736 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.2",
   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 8cf6eb5ad222e..e1e2fd2c75e69 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=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 61d317e696d1d..852728359c3cf 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.2/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