From c04a6a347174b7049e9eb1a21a0b1f1dae8f56a2 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 30 Aug 2022 00:04:26 +0300 Subject: [PATCH] Don't bundle slf4j-api inside testing-commons (#6520) --- testing-common/build.gradle.kts | 2 +- testing/armeria-shaded-for-testing/build.gradle.kts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts index 92769a2c77..1191a7386c 100644 --- a/testing-common/build.gradle.kts +++ b/testing-common/build.gradle.kts @@ -47,13 +47,13 @@ dependencies { api("org.awaitility:awaitility") api("com.google.guava:guava") api("org.mockito:mockito-core") + api("org.slf4j:slf4j-api") compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow")) implementation("io.opentelemetry.proto:opentelemetry-proto") implementation("net.bytebuddy:byte-buddy") - implementation("org.slf4j:slf4j-api") implementation("ch.qos.logback:logback-classic") implementation("org.slf4j:log4j-over-slf4j") implementation("org.slf4j:jcl-over-slf4j") diff --git a/testing/armeria-shaded-for-testing/build.gradle.kts b/testing/armeria-shaded-for-testing/build.gradle.kts index 49e06f2601..8f285b82eb 100644 --- a/testing/armeria-shaded-for-testing/build.gradle.kts +++ b/testing/armeria-shaded-for-testing/build.gradle.kts @@ -10,6 +10,10 @@ dependencies { tasks { shadowJar { + dependencies { + exclude(dependency("org.slf4j:slf4j-api")) + } + // Ensures tests are not affected by Armeria instrumentation relocate("com.linecorp.armeria", "io.opentelemetry.testing.internal.armeria") relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson")