Skip to content

Update gradle plugin to support Java 24 #8785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
id 'pl.allegro.tech.build.axion-release' version '1.14.4'
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'

id "com.github.johnrengelman.shadow" version "8.1.1" apply false
id "com.gradleup.shadow" version "8.3.6" apply false
id "me.champeau.jmh" version "0.7.0" apply false
id 'org.gradle.playframework' version '0.13' apply false
id 'info.solidsoft.pitest' version '1.9.11' apply false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
java
groovy
id("com.diffplug.spotless") version "6.13.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.gradleup.shadow") version "8.3.6"
}

java {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-bootstrap/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// The shadowJar of this project will be injected into the JVM's bootstrap classloader
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'me.champeau.jmh'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-ci-visibility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ buildscript {
}

plugins {
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
id 'java-test-fixtures'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-debugger/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-iast/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import net.ltgt.gradle.errorprone.CheckSeverity

plugins {
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
id 'me.champeau.jmh'
id 'java-test-fixtures'
id 'com.google.protobuf' version '0.8.18'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-jmxfetch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
import static java.nio.file.StandardOpenOption.CREATE

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}
apply from: "$rootDir/gradle/java.gradle"

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-logs-intake/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-otel/otel-bootstrap/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

def otelApiVersion = '1.38.0'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-profiling/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/appsec/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import groovy.json.JsonOutput
import groovy.json.JsonSlurper

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id "me.champeau.jmh"
id 'java-test-fixtures'
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/benchmark-integration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

subprojects { sub ->
sub.apply plugin: 'com.github.johnrengelman.shadow'
sub.apply plugin: 'com.gradleup.shadow'
sub.apply from: "$rootDir/gradle/java.gradle"
}
2 changes: 1 addition & 1 deletion dd-java-agent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import java.util.concurrent.atomic.AtomicBoolean

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

description = 'dd-java-agent'
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/cws-tls/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
}
}
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}
apply from: "$rootDir/gradle/java.gradle"

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/liberty-23/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java-test-fixtures'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}
apply from: "$rootDir/gradle/java.gradle"

Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/testing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/appsec/spring-tomcat7/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/appsec/springboot-graphql/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/appsec/springboot-grpc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/appsec/springboot-security/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'java'
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/appsec/springboot/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/armeria-grpc/application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
id 'application'
id 'java'
id "com.diffplug.spotless" version "6.13.0"
id "com.github.johnrengelman.shadow" version "7.1.2"
id "com.gradleup.shadow" version "8.3.6"
id 'com.google.protobuf' version '0.9.3'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/cli/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/concurrent/java-21/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/concurrent/java-8/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/crashtracking/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/custom-systemloader/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

description = 'Check classes loaded by custom system class-loader are transformed'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'java'
id 'org.springframework.boot' version '2.6.3'
}
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/debugger-integration-tests/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// Apply the application plugin to add support for building a CLI application in Java.
id 'application'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

shadowJar {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/dynamic-config/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/field-injection/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

description = 'Check fields get injected where expected'
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.time.Duration
import java.time.temporal.ChronoUnit

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/grpc-1.5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id 'java'
id 'java-test-fixtures'
id 'com.google.protobuf' version '0.9.4'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/iast-propagation/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.9.24'
id 'scala'
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/jersey-2/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'java-test-fixtures'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/jersey-3/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'java-test-fixtures'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/lib-injection/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/log-injection/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/maven/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/opentelemetry/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'application'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/opentracing/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/profiling-integration-tests/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/resteasy/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'java-test-fixtures'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}


Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-2.4-webflux/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-2.5-webflux/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer

plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
id 'java-test-fixtures'
}

Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/spring-boot-rabbit/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.github.johnrengelman.shadow"
id "com.gradleup.shadow"
}

apply from: "$rootDir/gradle/java.gradle"
Expand Down
Loading