Update shadow plugin to new version and coordinates (#11979)
This commit is contained in:
parent
d0e4a236b3
commit
d15927a8bc
|
@ -57,7 +57,7 @@ dependencies {
|
||||||
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
|
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")
|
||||||
implementation("com.google.guava:guava:33.2.1-jre")
|
implementation("com.google.guava:guava:33.2.1-jre")
|
||||||
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
|
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("org.apache.httpcomponents:httpclient:4.5.14")
|
||||||
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.17.6")
|
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:3.17.6")
|
||||||
implementation("org.owasp:dependency-check-gradle:10.0.3")
|
implementation("org.owasp:dependency-check-gradle:10.0.3")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: any modifications below should also be made in
|
// NOTE: any modifications below should also be made in
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$rootDir/gradle/shadow.gradle"
|
apply from: "$rootDir/gradle/shadow.gradle"
|
||||||
|
|
|
@ -13,7 +13,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
|
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"
|
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.7.0-alpha-SNAPSHOT"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
apply plugin: 'java'
|
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-generation'
|
||||||
apply plugin: 'io.opentelemetry.instrumentation.muzzle-check'
|
apply plugin: 'io.opentelemetry.instrumentation.muzzle-check'
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$rootDir/gradle/shadow.gradle"
|
apply from: "$rootDir/gradle/shadow.gradle"
|
||||||
|
|
|
@ -10,7 +10,7 @@ plugins {
|
||||||
into a single jar.
|
into a single jar.
|
||||||
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
|
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 "com.diffplug.spotless" version "6.25.0"
|
||||||
|
|
||||||
id "io.opentelemetry.instrumentation.muzzle-generation" version "2.7.0-alpha-SNAPSHOT"
|
id "io.opentelemetry.instrumentation.muzzle-generation" version "2.7.0-alpha-SNAPSHOT"
|
||||||
|
|
|
@ -39,7 +39,7 @@ dependencies {
|
||||||
implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
|
implementation("org.eclipse.aether:aether-transport-http:${aetherVersion}")
|
||||||
implementation("org.apache.maven:maven-aether-provider:3.3.9")
|
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")
|
testImplementation("org.assertj:assertj-core:3.26.3")
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,7 @@ import java.util.stream.StreamSupport
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
`java-library`
|
`java-library`
|
||||||
|
id("com.gradleup.shadow")
|
||||||
id("com.github.johnrengelman.shadow")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Select a random set of versions to test
|
// Select a random set of versions to test
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
id("otel.library-instrumentation")
|
id("otel.library-instrumentation")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
plugins {
|
plugins {
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
id("otel.publish-conventions")
|
id("otel.publish-conventions")
|
||||||
|
id("com.gradleup.shadow")
|
||||||
id("com.github.johnrengelman.shadow")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "io.opentelemetry.javaagent"
|
group = "io.opentelemetry.javaagent"
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,8 @@ import java.time.format.DateTimeFormatter
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
|
|
||||||
id("com.bmuschko.docker-remote-api")
|
id("com.bmuschko.docker-remote-api")
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
id("com.google.cloud.tools.jib")
|
id("com.google.cloud.tools.jib")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.johnrengelman.shadow")
|
id("com.gradleup.shadow")
|
||||||
|
|
||||||
id("otel.java-conventions")
|
id("otel.java-conventions")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue