From 3fc5d71771f32eb964504bffc22066d8b72897bd Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Tue, 6 Jul 2021 06:12:04 +0900 Subject: [PATCH] Don't publish testing -all jar. (#3493) --- ...y.instrumentation.javaagent-testing.gradle.kts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts b/buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts index b217a4e5dd..8b11975c11 100644 --- a/buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts +++ b/buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts @@ -40,7 +40,7 @@ val testInstrumentation by configurations.creating { isCanBeResolved = true } -tasks.named("shadowJar").configure { +tasks.shadowJar { configurations = listOf(project.configurations.runtimeClasspath.get(), testInstrumentation) archiveFileName.set("agent-testing.jar") @@ -108,6 +108,19 @@ afterEvaluate { } } +// shadowJar is only used for creating a jar for testing, but the shadow plugin automatically adds +// it to a project's published Java component. Skip it if publishing is configured for this +// project. +plugins.withId("maven-publish") { + configure { + (components["java"] as AdhocComponentWithVariants).run { + withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { + skip() + } + } + } +} + configurations.configureEach { if (name.toLowerCase().endsWith("testruntimeclasspath")) { // Added by agent, don't let Gradle bring it in when running tests.