From 6711277682dc7a6e9b288506b72517021f3fe0cd Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 7 May 2025 17:20:32 -0400
Subject: [PATCH 1/2] Upgrade gradle plug in

---
 build.gradle                                                  | 2 +-
 buildSrc/call-site-instrumentation-plugin/build.gradle.kts    | 2 +-
 dd-java-agent/agent-bootstrap/build.gradle                    | 2 +-
 dd-java-agent/agent-ci-visibility/build.gradle                | 2 +-
 dd-java-agent/agent-debugger/build.gradle                     | 2 +-
 dd-java-agent/agent-iast/build.gradle                         | 2 +-
 dd-java-agent/agent-jmxfetch/build.gradle                     | 2 +-
 dd-java-agent/agent-logs-intake/build.gradle                  | 2 +-
 dd-java-agent/agent-otel/otel-bootstrap/build.gradle          | 2 +-
 dd-java-agent/agent-profiling/build.gradle                    | 2 +-
 dd-java-agent/agent-profiling/profiling-ddprof/build.gradle   | 2 +-
 dd-java-agent/appsec/build.gradle                             | 2 +-
 dd-java-agent/benchmark-integration/build.gradle              | 2 +-
 dd-java-agent/build.gradle                                    | 2 +-
 dd-java-agent/cws-tls/build.gradle                            | 2 +-
 dd-java-agent/instrumentation/build.gradle                    | 2 +-
 dd-java-agent/instrumentation/liberty-23/build.gradle         | 2 +-
 dd-java-agent/testing/build.gradle                            | 2 +-
 dd-smoke-tests/appsec/spring-tomcat7/build.gradle             | 2 +-
 dd-smoke-tests/appsec/springboot-graphql/build.gradle         | 2 +-
 dd-smoke-tests/appsec/springboot-grpc/build.gradle            | 2 +-
 dd-smoke-tests/appsec/springboot-security/build.gradle        | 2 +-
 dd-smoke-tests/appsec/springboot/build.gradle                 | 2 +-
 dd-smoke-tests/armeria-grpc/application/build.gradle          | 2 +-
 dd-smoke-tests/cli/build.gradle                               | 2 +-
 dd-smoke-tests/concurrent/java-21/build.gradle                | 2 +-
 dd-smoke-tests/concurrent/java-8/build.gradle                 | 2 +-
 dd-smoke-tests/crashtracking/build.gradle                     | 2 +-
 dd-smoke-tests/custom-systemloader/build.gradle               | 2 +-
 dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle   | 2 +-
 dd-smoke-tests/debugger-integration-tests/build.gradle        | 2 +-
 .../debugger-integration-tests/latest-jdk-app/build.gradle    | 2 +-
 dd-smoke-tests/dynamic-config/build.gradle                    | 2 +-
 dd-smoke-tests/field-injection/build.gradle                   | 2 +-
 dd-smoke-tests/gradle/build.gradle                            | 2 +-
 dd-smoke-tests/grpc-1.5/build.gradle                          | 2 +-
 dd-smoke-tests/iast-propagation/build.gradle                  | 2 +-
 dd-smoke-tests/jersey-2/build.gradle                          | 2 +-
 dd-smoke-tests/jersey-3/build.gradle                          | 2 +-
 dd-smoke-tests/lib-injection/build.gradle                     | 2 +-
 dd-smoke-tests/log-injection/build.gradle                     | 2 +-
 dd-smoke-tests/maven/build.gradle                             | 2 +-
 dd-smoke-tests/opentelemetry/build.gradle                     | 2 +-
 dd-smoke-tests/opentracing/build.gradle                       | 2 +-
 dd-smoke-tests/profiling-integration-tests/build.gradle       | 2 +-
 dd-smoke-tests/resteasy/build.gradle                          | 2 +-
 dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle      | 2 +-
 dd-smoke-tests/spring-boot-2.4-webflux/build.gradle           | 2 +-
 dd-smoke-tests/spring-boot-2.5-webflux/build.gradle           | 2 +-
 dd-smoke-tests/spring-boot-2.6-webflux/build.gradle           | 2 +-
 dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle            | 2 +-
 dd-smoke-tests/spring-boot-rabbit/build.gradle                | 2 +-
 dd-smoke-tests/springboot-grpc/build.gradle                   | 2 +-
 dd-smoke-tests/springboot-mongo/build.gradle                  | 2 +-
 dd-smoke-tests/springboot/build.gradle                        | 2 +-
 dd-smoke-tests/vertx-3.4/application/build.gradle.kts         | 2 +-
 .../vertx-3.9-resteasy/application/build.gradle.kts           | 2 +-
 dd-smoke-tests/vertx-3.9/application/build.gradle.kts         | 2 +-
 dd-smoke-tests/vertx-4.2/application/build.gradle.kts         | 2 +-
 dd-trace-ot/build.gradle                                      | 2 +-
 gradle/java_no_deps.gradle                                    | 2 +-
 gradle/publish.gradle                                         | 4 ++--
 62 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/build.gradle b/build.gradle
index bae798ee109..6a7447502b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
diff --git a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
index 9495c7884d4..39c18c12258 100644
--- a/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
+++ b/buildSrc/call-site-instrumentation-plugin/build.gradle.kts
@@ -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 {
diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle
index 6e5ed6223de..bf9f1742443 100644
--- a/dd-java-agent/agent-bootstrap/build.gradle
+++ b/dd-java-agent/agent-bootstrap/build.gradle
@@ -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'
 }
 
diff --git a/dd-java-agent/agent-ci-visibility/build.gradle b/dd-java-agent/agent-ci-visibility/build.gradle
index 44b0f25d875..ada61134053 100644
--- a/dd-java-agent/agent-ci-visibility/build.gradle
+++ b/dd-java-agent/agent-ci-visibility/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
   id 'java-test-fixtures'
 }
 
diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle
index 62ce548499d..aa89e03477f 100644
--- a/dd-java-agent/agent-debugger/build.gradle
+++ b/dd-java-agent/agent-debugger/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
index cd061eb23fa..e4926474406 100644
--- a/dd-java-agent/agent-iast/build.gradle
+++ b/dd-java-agent/agent-iast/build.gradle
@@ -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'
diff --git a/dd-java-agent/agent-jmxfetch/build.gradle b/dd-java-agent/agent-jmxfetch/build.gradle
index 22774b81756..2aada1e32c1 100644
--- a/dd-java-agent/agent-jmxfetch/build.gradle
+++ b/dd-java-agent/agent-jmxfetch/build.gradle
@@ -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"
 
diff --git a/dd-java-agent/agent-logs-intake/build.gradle b/dd-java-agent/agent-logs-intake/build.gradle
index 0f13c02c797..8e23b9286ea 100644
--- a/dd-java-agent/agent-logs-intake/build.gradle
+++ b/dd-java-agent/agent-logs-intake/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
index f688ffdc365..87d064d1db3 100644
--- a/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
+++ b/dd-java-agent/agent-otel/otel-bootstrap/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 def otelApiVersion = '1.38.0'
diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle
index c6fe12b8e59..64d39485b19 100644
--- a/dd-java-agent/agent-profiling/build.gradle
+++ b/dd-java-agent/agent-profiling/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
index 223862da61a..8263d06c63d 100644
--- a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
+++ b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 ext {
diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle
index ae2d6a9b729..c3b8c0f5a79 100644
--- a/dd-java-agent/appsec/build.gradle
+++ b/dd-java-agent/appsec/build.gradle
@@ -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'
 }
diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle
index bd1262e17fe..45e879ff667 100644
--- a/dd-java-agent/benchmark-integration/build.gradle
+++ b/dd-java-agent/benchmark-integration/build.gradle
@@ -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"
 }
diff --git a/dd-java-agent/build.gradle b/dd-java-agent/build.gradle
index 25eae23d3fc..1b2c3804acb 100644
--- a/dd-java-agent/build.gradle
+++ b/dd-java-agent/build.gradle
@@ -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'
diff --git a/dd-java-agent/cws-tls/build.gradle b/dd-java-agent/cws-tls/build.gradle
index f90a895e0bc..a74a6dec2ab 100644
--- a/dd-java-agent/cws-tls/build.gradle
+++ b/dd-java-agent/cws-tls/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
index 3aecf9212b3..2d19b5f5b6f 100644
--- a/dd-java-agent/instrumentation/build.gradle
+++ b/dd-java-agent/instrumentation/build.gradle
@@ -24,7 +24,7 @@ buildscript {
   }
 }
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 apply from: "$rootDir/gradle/java.gradle"
 
diff --git a/dd-java-agent/instrumentation/liberty-23/build.gradle b/dd-java-agent/instrumentation/liberty-23/build.gradle
index 8d88ad12b93..c241cdc782d 100644
--- a/dd-java-agent/instrumentation/liberty-23/build.gradle
+++ b/dd-java-agent/instrumentation/liberty-23/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java-test-fixtures'
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 apply from: "$rootDir/gradle/java.gradle"
 
diff --git a/dd-java-agent/testing/build.gradle b/dd-java-agent/testing/build.gradle
index 013fddfbdcb..00394d6f480 100644
--- a/dd-java-agent/testing/build.gradle
+++ b/dd-java-agent/testing/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 ext {
diff --git a/dd-smoke-tests/appsec/spring-tomcat7/build.gradle b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle
index bb3b9ddf5e9..7ee94c77fcb 100644
--- a/dd-smoke-tests/appsec/spring-tomcat7/build.gradle
+++ b/dd-smoke-tests/appsec/spring-tomcat7/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/appsec/springboot-graphql/build.gradle b/dd-smoke-tests/appsec/springboot-graphql/build.gradle
index 8be0af74bcd..1fbc8f8b890 100644
--- a/dd-smoke-tests/appsec/springboot-graphql/build.gradle
+++ b/dd-smoke-tests/appsec/springboot-graphql/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/appsec/springboot-grpc/build.gradle b/dd-smoke-tests/appsec/springboot-grpc/build.gradle
index 96e6f3fd747..fcf1c882e22 100644
--- a/dd-smoke-tests/appsec/springboot-grpc/build.gradle
+++ b/dd-smoke-tests/appsec/springboot-grpc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 ext {
diff --git a/dd-smoke-tests/appsec/springboot-security/build.gradle b/dd-smoke-tests/appsec/springboot-security/build.gradle
index e3063ba0242..9d9859ed65d 100644
--- a/dd-smoke-tests/appsec/springboot-security/build.gradle
+++ b/dd-smoke-tests/appsec/springboot-security/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/appsec/springboot/build.gradle b/dd-smoke-tests/appsec/springboot/build.gradle
index 76aa63dfba6..c443bfdb9ae 100644
--- a/dd-smoke-tests/appsec/springboot/build.gradle
+++ b/dd-smoke-tests/appsec/springboot/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/armeria-grpc/application/build.gradle b/dd-smoke-tests/armeria-grpc/application/build.gradle
index a1fa509667b..795ada9258e 100644
--- a/dd-smoke-tests/armeria-grpc/application/build.gradle
+++ b/dd-smoke-tests/armeria-grpc/application/build.gradle
@@ -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'
 }
 
diff --git a/dd-smoke-tests/cli/build.gradle b/dd-smoke-tests/cli/build.gradle
index 567444b0b81..4d601efc0d3 100644
--- a/dd-smoke-tests/cli/build.gradle
+++ b/dd-smoke-tests/cli/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/concurrent/java-21/build.gradle b/dd-smoke-tests/concurrent/java-21/build.gradle
index 147758d8b89..e8eb4fb373b 100644
--- a/dd-smoke-tests/concurrent/java-21/build.gradle
+++ b/dd-smoke-tests/concurrent/java-21/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 ext {
diff --git a/dd-smoke-tests/concurrent/java-8/build.gradle b/dd-smoke-tests/concurrent/java-8/build.gradle
index 2afc5b0a712..4c4ffbe4b86 100644
--- a/dd-smoke-tests/concurrent/java-8/build.gradle
+++ b/dd-smoke-tests/concurrent/java-8/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/crashtracking/build.gradle b/dd-smoke-tests/crashtracking/build.gradle
index de3b8dbb30c..12916dac735 100644
--- a/dd-smoke-tests/crashtracking/build.gradle
+++ b/dd-smoke-tests/crashtracking/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 ext {
diff --git a/dd-smoke-tests/custom-systemloader/build.gradle b/dd-smoke-tests/custom-systemloader/build.gradle
index 1d79c3a34eb..efc5be5d154 100644
--- a/dd-smoke-tests/custom-systemloader/build.gradle
+++ b/dd-smoke-tests/custom-systemloader/build.gradle
@@ -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'
diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle
index ad707301e3b..90fe9bc7788 100644
--- a/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle
+++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java'
   id 'org.springframework.boot' version '2.6.3'
 }
diff --git a/dd-smoke-tests/debugger-integration-tests/build.gradle b/dd-smoke-tests/debugger-integration-tests/build.gradle
index 5b3f97739ea..92fd9b14410 100644
--- a/dd-smoke-tests/debugger-integration-tests/build.gradle
+++ b/dd-smoke-tests/debugger-integration-tests/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/debugger-integration-tests/latest-jdk-app/build.gradle b/dd-smoke-tests/debugger-integration-tests/latest-jdk-app/build.gradle
index 50e5ad19684..10068bad13a 100644
--- a/dd-smoke-tests/debugger-integration-tests/latest-jdk-app/build.gradle
+++ b/dd-smoke-tests/debugger-integration-tests/latest-jdk-app/build.gradle
@@ -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 {
diff --git a/dd-smoke-tests/dynamic-config/build.gradle b/dd-smoke-tests/dynamic-config/build.gradle
index a8b3c6b73f4..e8644cc70ca 100644
--- a/dd-smoke-tests/dynamic-config/build.gradle
+++ b/dd-smoke-tests/dynamic-config/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/field-injection/build.gradle b/dd-smoke-tests/field-injection/build.gradle
index bff5719742b..1de98959157 100644
--- a/dd-smoke-tests/field-injection/build.gradle
+++ b/dd-smoke-tests/field-injection/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 description = 'Check fields get injected where expected'
diff --git a/dd-smoke-tests/gradle/build.gradle b/dd-smoke-tests/gradle/build.gradle
index 99d07403378..8a65e0b1949 100644
--- a/dd-smoke-tests/gradle/build.gradle
+++ b/dd-smoke-tests/gradle/build.gradle
@@ -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"
diff --git a/dd-smoke-tests/grpc-1.5/build.gradle b/dd-smoke-tests/grpc-1.5/build.gradle
index 88fb250c622..ef5755906e0 100644
--- a/dd-smoke-tests/grpc-1.5/build.gradle
+++ b/dd-smoke-tests/grpc-1.5/build.gradle
@@ -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"
diff --git a/dd-smoke-tests/iast-propagation/build.gradle b/dd-smoke-tests/iast-propagation/build.gradle
index 52bc7e8a3ae..a5d01f6962f 100644
--- a/dd-smoke-tests/iast-propagation/build.gradle
+++ b/dd-smoke-tests/iast-propagation/build.gradle
@@ -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'
diff --git a/dd-smoke-tests/jersey-2/build.gradle b/dd-smoke-tests/jersey-2/build.gradle
index 1b2536dea91..26bc210173c 100644
--- a/dd-smoke-tests/jersey-2/build.gradle
+++ b/dd-smoke-tests/jersey-2/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java-test-fixtures'
 }
 
diff --git a/dd-smoke-tests/jersey-3/build.gradle b/dd-smoke-tests/jersey-3/build.gradle
index f569b3d16f5..72f34087434 100644
--- a/dd-smoke-tests/jersey-3/build.gradle
+++ b/dd-smoke-tests/jersey-3/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java-test-fixtures'
 }
 
diff --git a/dd-smoke-tests/lib-injection/build.gradle b/dd-smoke-tests/lib-injection/build.gradle
index 4ba8f931206..73ed7207571 100644
--- a/dd-smoke-tests/lib-injection/build.gradle
+++ b/dd-smoke-tests/lib-injection/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/log-injection/build.gradle b/dd-smoke-tests/log-injection/build.gradle
index 741806a644d..97c2ccb8f80 100644
--- a/dd-smoke-tests/log-injection/build.gradle
+++ b/dd-smoke-tests/log-injection/build.gradle
@@ -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"
diff --git a/dd-smoke-tests/maven/build.gradle b/dd-smoke-tests/maven/build.gradle
index 2d352f03411..b7f34643e2f 100644
--- a/dd-smoke-tests/maven/build.gradle
+++ b/dd-smoke-tests/maven/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/opentelemetry/build.gradle b/dd-smoke-tests/opentelemetry/build.gradle
index 6be9c1ece03..79abca40fda 100644
--- a/dd-smoke-tests/opentelemetry/build.gradle
+++ b/dd-smoke-tests/opentelemetry/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id 'application'
-  id 'com.github.johnrengelman.shadow'
+  id 'com.gradleup.shadow'
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/opentracing/build.gradle b/dd-smoke-tests/opentracing/build.gradle
index 0380928a124..ea2b40c97db 100644
--- a/dd-smoke-tests/opentracing/build.gradle
+++ b/dd-smoke-tests/opentracing/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/profiling-integration-tests/build.gradle b/dd-smoke-tests/profiling-integration-tests/build.gradle
index 81508b8094b..553a139aae1 100644
--- a/dd-smoke-tests/profiling-integration-tests/build.gradle
+++ b/dd-smoke-tests/profiling-integration-tests/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 ext {
diff --git a/dd-smoke-tests/resteasy/build.gradle b/dd-smoke-tests/resteasy/build.gradle
index e3ca38289c2..d30adb63e89 100644
--- a/dd-smoke-tests/resteasy/build.gradle
+++ b/dd-smoke-tests/resteasy/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java-test-fixtures'
 }
 
diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle
index 0c4362c9fff..0c3122a4535 100644
--- a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 
diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle
index 9f2b7f3a0ec..48610870450 100644
--- a/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle
index 99420989357..3bc97b8b30b 100644
--- a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
index 5b1514b203a..a234d6cd0e5 100644
--- a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
@@ -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"
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
index a9970816ed6..cfe02535f34 100644
--- a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
+++ b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java-test-fixtures'
 }
 
diff --git a/dd-smoke-tests/spring-boot-rabbit/build.gradle b/dd-smoke-tests/spring-boot-rabbit/build.gradle
index b8f43789417..94323021834 100644
--- a/dd-smoke-tests/spring-boot-rabbit/build.gradle
+++ b/dd-smoke-tests/spring-boot-rabbit/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/springboot-grpc/build.gradle b/dd-smoke-tests/springboot-grpc/build.gradle
index 9f6cddd6789..efeb2fceec3 100644
--- a/dd-smoke-tests/springboot-grpc/build.gradle
+++ b/dd-smoke-tests/springboot-grpc/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'com.google.protobuf' version '0.8.18'
 }
 
diff --git a/dd-smoke-tests/springboot-mongo/build.gradle b/dd-smoke-tests/springboot-mongo/build.gradle
index cda9c466598..75c6612ed1d 100644
--- a/dd-smoke-tests/springboot-mongo/build.gradle
+++ b/dd-smoke-tests/springboot-mongo/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
 }
 
 apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-smoke-tests/springboot/build.gradle b/dd-smoke-tests/springboot/build.gradle
index 3e0161aa2cb..ef534ba722b 100644
--- a/dd-smoke-tests/springboot/build.gradle
+++ b/dd-smoke-tests/springboot/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id 'java-test-fixtures'
 }
 
diff --git a/dd-smoke-tests/vertx-3.4/application/build.gradle.kts b/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
index 70ff53690f6..a447bc7e395 100644
--- a/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.github.johnrengelman.shadow") version "7.0.0"
+  id("com.gradleup.shadow") version "8.3.6"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts b/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
index e93814ff076..ce12dffa493 100644
--- a/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.github.johnrengelman.shadow") version "7.0.0"
+  id("com.gradleup.shadow") version "8.3.6"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-3.9/application/build.gradle.kts b/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
index 3676f86a3fa..83096097d1e 100644
--- a/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.github.johnrengelman.shadow") version "7.0.0"
+  id("com.gradleup.shadow") version "8.3.6"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-4.2/application/build.gradle.kts b/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
index 983d6eddda2..0f2a655db73 100644
--- a/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.github.johnrengelman.shadow") version "7.0.0"
+  id("com.gradleup.shadow") version "8.3.6"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-trace-ot/build.gradle b/dd-trace-ot/build.gradle
index 77212c99889..fa5e07f10dc 100644
--- a/dd-trace-ot/build.gradle
+++ b/dd-trace-ot/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.github.johnrengelman.shadow"
+  id "com.gradleup.shadow"
   id "me.champeau.jmh"
 }
 
diff --git a/gradle/java_no_deps.gradle b/gradle/java_no_deps.gradle
index 95a87f0e8ed..bd4f3ed0aac 100644
--- a/gradle/java_no_deps.gradle
+++ b/gradle/java_no_deps.gradle
@@ -242,7 +242,7 @@ project.afterEvaluate {
   }
 }
 
-if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
+if (project.plugins.hasPlugin('com.gradleup.shadow')) {
   // Remove the no-deps jar from the archives to prevent publication
   configurations.archives.with {
     artifacts.remove artifacts.find {
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 8fb8b6c55f6..3e3f9456aa9 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -21,7 +21,7 @@ assert !forceLocal || forceLocal != isGitlabCI
 publishing {
   publications {
     maven(MavenPublication) { MavenPublication publication ->
-      if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
+      if (project.plugins.hasPlugin('com.gradleup.shadow')) {
         publication.artifact(project.tasks.shadowJar)
 
         // Required by Maven Central:
@@ -56,7 +56,7 @@ publishing {
   }
 }
 
-if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
+if (project.plugins.hasPlugin('com.gradleup.shadow')) {
   // Disable gradle module metadata to avoid publishing contradictory info.
   tasks.withType(GenerateModuleMetadata).configureEach {
     enabled = false

From e0266f1aa14a3c838882aaff80767f6aafa35acc Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Thu, 8 May 2025 09:25:00 -0400
Subject: [PATCH 2/2] Reset vertx smoketests

---
 dd-smoke-tests/vertx-3.4/application/build.gradle.kts          | 2 +-
 dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts | 2 +-
 dd-smoke-tests/vertx-3.9/application/build.gradle.kts          | 2 +-
 dd-smoke-tests/vertx-4.2/application/build.gradle.kts          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dd-smoke-tests/vertx-3.4/application/build.gradle.kts b/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
index a447bc7e395..70ff53690f6 100644
--- a/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.4/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.gradleup.shadow") version "8.3.6"
+  id("com.github.johnrengelman.shadow") version "7.0.0"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts b/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
index ce12dffa493..e93814ff076 100644
--- a/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.9-resteasy/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.gradleup.shadow") version "8.3.6"
+  id("com.github.johnrengelman.shadow") version "7.0.0"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-3.9/application/build.gradle.kts b/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
index 83096097d1e..3676f86a3fa 100644
--- a/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-3.9/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.gradleup.shadow") version "8.3.6"
+  id("com.github.johnrengelman.shadow") version "7.0.0"
 }
 
 if (hasProperty("appBuildDir")) {
diff --git a/dd-smoke-tests/vertx-4.2/application/build.gradle.kts b/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
index 0f2a655db73..983d6eddda2 100644
--- a/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
+++ b/dd-smoke-tests/vertx-4.2/application/build.gradle.kts
@@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.*
 plugins {
   java
   application
-  id("com.gradleup.shadow") version "8.3.6"
+  id("com.github.johnrengelman.shadow") version "7.0.0"
 }
 
 if (hasProperty("appBuildDir")) {