Skip to content

Commit

Permalink
KAFKA-12728: version upgrades: gradle (6.8.3 -->> 7.0.2) and gradle s…
Browse files Browse the repository at this point in the history
…hadow 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`
  • Loading branch information
dejan2609 committed May 14, 2021
1 parent 29c55fd commit 9033401
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9033401

Please sign in to comment.