From e84bf3ca9beb3c0e6f2d4d2521e1be00b19b9ddc Mon Sep 17 00:00:00 2001 From: Nancy <120571969+Nancy-ksolves@users.noreply.github.com> Date: Fri, 21 Jun 2024 00:59:57 +0530 Subject: [PATCH] KAFKA-16803: Change fork, update ShadowJavaPlugin to 8.1.7 (#16295) Reviewers: Greg Harris , Divij Vaidya --- build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index e6b52748ed727..914e1ac2269b5 100644 --- a/build.gradle +++ b/build.gradle @@ -44,9 +44,7 @@ plugins { // be dropped from gradle/resources/dependencycheck-suppressions.xml id "com.github.spotbugs" version '5.1.3' apply false id 'org.scoverage' version '8.0.3' apply false - // Updating the shadow plugin version to 8.1.1 causes issue with signing and publishing the shadowed - // artifacts - see https://github.com/johnrengelman/shadow/issues/901 - id 'com.github.johnrengelman.shadow' version '8.1.0' apply false + id 'io.github.goooler.shadow' version '8.1.7' apply false // Spotless 6.13.0 has issue with Java 21 (see https://github.com/diffplug/spotless/pull/1920), and Spotless 6.14.0+ requires JRE 11 // We are going to drop JDK8 support. Hence, the spotless is upgrade to newest version and be applied only if the build env is compatible with JDK 11. // spotless 6.15.0+ has issue in runtime with JDK8 even through we define it with `apply:false`. see https://github.com/diffplug/spotless/issues/2156 for more details @@ -340,7 +338,7 @@ subprojects { if (!shouldPublishWithShadow) { from components.java } else { - apply plugin: 'com.github.johnrengelman.shadow' + apply plugin: 'io.github.goooler.shadow' project.shadow.component(mavenJava) // Fix for avoiding inclusion of runtime dependencies marked as 'shadow' in MANIFEST Class-Path. @@ -2931,7 +2929,7 @@ project(':streams:upgrade-system-tests-37') { project(':jmh-benchmarks') { - apply plugin: 'com.github.johnrengelman.shadow' + apply plugin: 'io.github.goooler.shadow' shadowJar { archiveBaseName = 'kafka-jmh-benchmarks'