From d15927a8bc8f788c1e7aa7914f616c58a61c149c Mon Sep 17 00:00:00 2001
From: jason plumb <75337021+breedx-splk@users.noreply.github.com>
Date: Thu, 8 Aug 2024 23:40:04 -0700
Subject: [PATCH] Update shadow plugin to new version and coordinates (#11979)

---
 conventions/build.gradle.kts                                   | 2 +-
 ...pentelemetry.instrumentation.javaagent-shadowing.gradle.kts | 2 +-
 examples/distro/agent/build.gradle                             | 2 +-
 examples/distro/build.gradle                                   | 2 +-
 examples/distro/gradle/instrumentation.gradle                  | 2 +-
 examples/distro/testing/agent-for-testing/build.gradle         | 2 +-
 examples/extension/build.gradle                                | 2 +-
 gradle-plugins/build.gradle.kts                                | 2 +-
 .../io.opentelemetry.instrumentation.muzzle-check.gradle.kts   | 3 +--
 .../library-instrumentation-shaded/build.gradle.kts            | 3 +--
 .../library-instrumentation-shaded/build.gradle.kts            | 3 +--
 .../library-instrumentation-shaded/build.gradle.kts            | 3 +--
 .../tracing-opentelemetry-shaded/build.gradle.kts              | 3 +--
 .../tracing-opentelemetry-shaded/build.gradle.kts              | 2 +-
 .../tracing-opentelemetry-shaded/build.gradle.kts              | 3 +--
 instrumentation/jdbc/library/build.gradle.kts                  | 2 +-
 .../r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts  | 3 +--
 javaagent-internal-logging-simple/build.gradle.kts             | 3 +--
 opentelemetry-api-shaded-for-instrumenting/build.gradle.kts    | 3 +--
 .../build.gradle.kts                                           | 3 +--
 .../build.gradle.kts                                           | 3 +--
 .../build.gradle.kts                                           | 3 +--
 smoke-tests/images/fake-backend/build.gradle.kts               | 3 +--
 testing/agent-exporter/build.gradle.kts                        | 2 +-
 testing/armeria-shaded-for-testing/build.gradle.kts            | 3 +--
 25 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
index 7cb1e1be8b10..1454ffa411b8 100644
--- a/conventions/build.gradle.kts
+++ b/conventions/build.gradle.kts
@@ -57,7 +57,7 @@ dependencies {
   implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
   implementation("com.google.guava:guava:33.2.1-jre")
   implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
-  implementation("com.github.johnrengelman:shadow:8.1.1")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.17.6")
   implementation("org.owasp:dependency-check-gradle:10.0.3")
diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
index cf37eadaf5de..7b4e59d77d1d 100644
--- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
+++ b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
 }
 
 // NOTE: any modifications below should also be made in
diff --git a/examples/distro/agent/build.gradle b/examples/distro/agent/build.gradle
index 096b0d0439e5..3045dbaeca8a 100644
--- a/examples/distro/agent/build.gradle
+++ b/examples/distro/agent/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/shadow.gradle"
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
index 007d5a6a1f03..c1539ab6cb71 100644
--- a/examples/distro/build.gradle
+++ b/examples/distro/build.gradle
@@ -13,7 +13,7 @@ buildscript {
   }
   dependencies {
     classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
-    classpath "com.github.johnrengelman:shadow:8.1.1"
+    classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.0"
     classpath "io.opentelemetry.instrumentation:gradle-plugins:2.7.0-alpha-SNAPSHOT"
   }
 }
diff --git a/examples/distro/gradle/instrumentation.gradle b/examples/distro/gradle/instrumentation.gradle
index da861688cecd..ad484d8d2821 100644
--- a/examples/distro/gradle/instrumentation.gradle
+++ b/examples/distro/gradle/instrumentation.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'com.gradleup.shadow'
 apply plugin: 'io.opentelemetry.instrumentation.muzzle-generation'
 apply plugin: 'io.opentelemetry.instrumentation.muzzle-check'
 
diff --git a/examples/distro/testing/agent-for-testing/build.gradle b/examples/distro/testing/agent-for-testing/build.gradle
index 0879f3985de4..5eec782efd4c 100644
--- a/examples/distro/testing/agent-for-testing/build.gradle
+++ b/examples/distro/testing/agent-for-testing/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/shadow.gradle"
diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
index c82856069adf..625bb443376d 100644
--- a/examples/extension/build.gradle
+++ b/examples/extension/build.gradle
@@ -10,7 +10,7 @@ plugins {
   into a single jar.
   See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
    */
-  id "com.github.johnrengelman.shadow" version "8.1.1"
+  id "com.gradleup.shadow" version "8.3.0"
   id "com.diffplug.spotless" version "6.25.0"
 
   id "io.opentelemetry.instrumentation.muzzle-generation" version "2.7.0-alpha-SNAPSHOT"
diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
index 7e682abae417..01cc58d93509 100644
--- a/gradle-plugins/build.gradle.kts
+++ b/gradle-plugins/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
   implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
   implementation("org.apache.maven:maven-aether-provider:3.3.9")
 
-  implementation("com.github.johnrengelman:shadow:8.1.1")
+  implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.0")
 
   testImplementation("org.assertj:assertj-core:3.26.3")
 
diff --git a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
index 1b6cebb97f38..c010f21568fa 100644
--- a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
+++ b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-check.gradle.kts
@@ -28,8 +28,7 @@ import java.util.stream.StreamSupport
 
 plugins {
   `java-library`
-
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
 }
 
 // Select a random set of versions to test
diff --git a/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
index 25dbbc455e5e..67250df40347 100644
--- a/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.14/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
index 590937930dee..ebcd721e7c19 100644
--- a/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.19/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts b/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
index 940331b69140..423f391f7e29 100644
--- a/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/azure-core/azure-core-1.36/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded/build.gradle.kts
index 366ba2c0aef4..128e45cc51f1 100644
--- a/instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded/build.gradle.kts
+++ b/instrumentation/couchbase/couchbase-3.1.6/tracing-opentelemetry-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded/build.gradle.kts b/instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded/build.gradle.kts
index 53e83b2a78dd..e1bff72f5885 100644
--- a/instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded/build.gradle.kts
+++ b/instrumentation/couchbase/couchbase-3.1/tracing-opentelemetry-shaded/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
 
   id("otel.java-conventions")
 }
diff --git a/instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded/build.gradle.kts b/instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded/build.gradle.kts
index 9844a74e964e..c97e14e07e7a 100644
--- a/instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded/build.gradle.kts
+++ b/instrumentation/couchbase/couchbase-3.2/tracing-opentelemetry-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/instrumentation/jdbc/library/build.gradle.kts b/instrumentation/jdbc/library/build.gradle.kts
index e5c6649cff54..02af72e4c9dc 100644
--- a/instrumentation/jdbc/library/build.gradle.kts
+++ b/instrumentation/jdbc/library/build.gradle.kts
@@ -4,7 +4,7 @@
  */
 
 plugins {
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
   id("otel.library-instrumentation")
 }
 
diff --git a/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts b/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts
index 4367637190c8..c750072d17ab 100644
--- a/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts
+++ b/instrumentation/r2dbc-1.0/library-instrumentation-shaded/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/javaagent-internal-logging-simple/build.gradle.kts b/javaagent-internal-logging-simple/build.gradle.kts
index 125653c86421..b87f59ec43cf 100644
--- a/javaagent-internal-logging-simple/build.gradle.kts
+++ b/javaagent-internal-logging-simple/build.gradle.kts
@@ -3,8 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
   id("otel.java-conventions")
   id("otel.publish-conventions")
-
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
 }
 
 group = "io.opentelemetry.javaagent"
diff --git a/opentelemetry-api-shaded-for-instrumenting/build.gradle.kts b/opentelemetry-api-shaded-for-instrumenting/build.gradle.kts
index 47292515b076..1f188a09a255 100644
--- a/opentelemetry-api-shaded-for-instrumenting/build.gradle.kts
+++ b/opentelemetry-api-shaded-for-instrumenting/build.gradle.kts
@@ -1,8 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/opentelemetry-ext-annotations-shaded-for-instrumenting/build.gradle.kts b/opentelemetry-ext-annotations-shaded-for-instrumenting/build.gradle.kts
index d0c92d3611ba..a95aca5f8e1b 100644
--- a/opentelemetry-ext-annotations-shaded-for-instrumenting/build.gradle.kts
+++ b/opentelemetry-ext-annotations-shaded-for-instrumenting/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/opentelemetry-instrumentation-annotations-shaded-for-instrumenting/build.gradle.kts b/opentelemetry-instrumentation-annotations-shaded-for-instrumenting/build.gradle.kts
index 3dc29118754b..177ebb817e6d 100644
--- a/opentelemetry-instrumentation-annotations-shaded-for-instrumenting/build.gradle.kts
+++ b/opentelemetry-instrumentation-annotations-shaded-for-instrumenting/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/opentelemetry-instrumentation-api-shaded-for-instrumenting/build.gradle.kts b/opentelemetry-instrumentation-api-shaded-for-instrumenting/build.gradle.kts
index 64450dad1ae3..5d44310162f7 100644
--- a/opentelemetry-instrumentation-api-shaded-for-instrumenting/build.gradle.kts
+++ b/opentelemetry-instrumentation-api-shaded-for-instrumenting/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/smoke-tests/images/fake-backend/build.gradle.kts b/smoke-tests/images/fake-backend/build.gradle.kts
index 687666c6a49d..0bc46581b95b 100644
--- a/smoke-tests/images/fake-backend/build.gradle.kts
+++ b/smoke-tests/images/fake-backend/build.gradle.kts
@@ -5,9 +5,8 @@ import java.time.format.DateTimeFormatter
 
 plugins {
   id("otel.java-conventions")
-
   id("com.bmuschko.docker-remote-api")
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
   id("com.google.cloud.tools.jib")
 }
 
diff --git a/testing/agent-exporter/build.gradle.kts b/testing/agent-exporter/build.gradle.kts
index 063a7d3a01dc..f42ab5055727 100644
--- a/testing/agent-exporter/build.gradle.kts
+++ b/testing/agent-exporter/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 
diff --git a/testing/armeria-shaded-for-testing/build.gradle.kts b/testing/armeria-shaded-for-testing/build.gradle.kts
index cc9c166d6000..580885e1e3aa 100644
--- a/testing/armeria-shaded-for-testing/build.gradle.kts
+++ b/testing/armeria-shaded-for-testing/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }