Skip to content

Commit ad91c5e

Browse files
authored
KAFKA-12728: Upgrade gradle to 7.0.2 and shadow to 7.0.0 (#10606)
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` Reviewers: Ismael Juma <[email protected]>
1 parent f20fdbd commit ad91c5e

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ plugins {
4040
id "com.github.spotbugs" version '4.7.1' apply false
4141
id 'org.gradle.test-retry' version '1.2.1' apply false
4242
id 'org.scoverage' version '5.0.0' apply false
43-
id 'com.github.johnrengelman.shadow' version '6.1.0' apply false
43+
id 'com.github.johnrengelman.shadow' version '7.0.0' apply false
4444
}
4545

4646
spotless {
@@ -842,15 +842,15 @@ project(':core') {
842842

843843
configurations {
844844
// manually excludes some unnecessary dependencies
845-
compile.exclude module: 'javax'
846-
compile.exclude module: 'jline'
847-
compile.exclude module: 'jms'
848-
compile.exclude module: 'jmxri'
849-
compile.exclude module: 'jmxtools'
850-
compile.exclude module: 'mail'
845+
implementation.exclude module: 'javax'
846+
implementation.exclude module: 'jline'
847+
implementation.exclude module: 'jms'
848+
implementation.exclude module: 'jmxri'
849+
implementation.exclude module: 'jmxtools'
850+
implementation.exclude module: 'mail'
851851
// To prevent a UniqueResourceException due the same resource existing in both
852852
// org.apache.directory.api/api-all and org.apache.directory.api/api-ldap-schema-data
853-
testCompile.exclude module: 'api-ldap-schema-data'
853+
testImplementation.exclude module: 'api-ldap-schema-data'
854854
}
855855

856856
tasks.create(name: "copyDependantLibs", type: Copy) {

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ versions += [
6161
bcpkix: "1.66",
6262
checkstyle: "8.36.2",
6363
commonsCli: "1.4",
64-
gradle: "6.8.3",
64+
gradle: "7.0.2",
6565
grgit: "4.1.0",
6666
httpclient: "4.5.13",
6767
easymock: "4.3",
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
3+
distributionSha256Sum=13bf8d3cf8eeeb5770d19741a59bde9bd966dd78d17f1bbad787a05ef19d1c2d
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env sh
22

3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
36
# Licensed under the Apache License, Version 2.0 (the "License");
47
# you may not use this file except in compliance with the License.
58
# You may obtain a copy of the License at
@@ -81,7 +84,7 @@ esac
8184
# Loop in case we encounter an error.
8285
for attempt in 1 2 3; do
8386
if [ ! -e "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" ]; then
84-
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
87+
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
8588
rm -f "$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
8689
# Pause for a bit before looping in case the server throttled us.
8790
sleep 5

0 commit comments

Comments
 (0)