Update shadow plugin to new version and coordinates (#11979)

breedx-splk · web-flow · commit d15927a8bc8f · 2024-08-09T09:40:04.000+03:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,5 @@
 plugins {
-  id("com.github.johnrengelman.shadow")
-
+  id("com.gradleup.shadow")
   id("otel.java-conventions")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id("com.github.johnrengelman.shadow")`
	`4`	`+ id("com.gradleup.shadow")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`// NOTE: any modifications below should also be made in`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ buildscript {`
`13`	`13`	`}`
`14`	`14`	`dependencies {`
`15`	`15`	`classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"`
`16`		`- classpath "com.github.johnrengelman:shadow:8.1.1"`
	`16`	`+ classpath "com.gradleup.shadow:shadow-gradle-plugin:8.3.0"`
`17`	`17`	`classpath "io.opentelemetry.instrumentation:gradle-plugins:2.7.0-alpha-SNAPSHOT"`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ import java.util.stream.StreamSupport`
`28`	`28`
`29`	`29`	`plugins {`
`30`	`30`	`java-library`
`31`		`-`
`32`		`- id("com.github.johnrengelman.shadow")`
	`31`	`+ id("com.gradleup.shadow")`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`// Select a random set of versions to test`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("com.github.johnrengelman.shadow")`
`3`		`-`
	`2`	`+ id("com.gradleup.shadow")`
`4`	`3`	`id("otel.java-conventions")`
`5`	`4`	`}`
`6`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("com.github.johnrengelman.shadow")`
	`2`	`+ id("com.gradleup.shadow")`
`3`	`3`
`4`	`4`	`id("otel.java-conventions")`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*/`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- id("com.github.johnrengelman.shadow")`
	`7`	`+ id("com.gradleup.shadow")`
`8`	`8`	`id("otel.library-instrumentation")`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
`3`	`3`	`plugins {`
`4`	`4`	`id("otel.java-conventions")`
`5`	`5`	`id("otel.publish-conventions")`
`6`		`-`
`7`		`- id("com.github.johnrengelman.shadow")`
	`6`	`+ id("com.gradleup.shadow")`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`group = "io.opentelemetry.javaagent"`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id("com.github.johnrengelman.shadow")`
`5`		`-`
	`4`	`+ id("com.gradleup.shadow")`
`6`	`5`	`id("otel.java-conventions")`
`7`	`6`	`}`
`8`	`7`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@ import java.time.format.DateTimeFormatter`
`5`	`5`
`6`	`6`	`plugins {`
`7`	`7`	`id("otel.java-conventions")`
`8`		`-`
`9`	`8`	`id("com.bmuschko.docker-remote-api")`
`10`		`- id("com.github.johnrengelman.shadow")`
	`9`	`+ id("com.gradleup.shadow")`
`11`	`10`	`id("com.google.cloud.tools.jib")`
`12`	`11`	`}`
`13`	`12`