Skip to content

Commit

Permalink
KAFKA-16803: Change fork, update ShadowJavaPlugin to 8.1.7 (#16295)
Browse files Browse the repository at this point in the history
Reviewers: Greg Harris <[email protected]>, Divij Vaidya <[email protected]>
  • Loading branch information
Nancy-ksolves authored Jun 20, 2024
1 parent 2d692e4 commit 391778b
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit 391778b

Please sign in to comment.