From fd3ea5f006514900da742b09bac3413f338617bb Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 28 Sep 2022 13:43:10 -0700 Subject: [PATCH 1/3] Update to slf4j 2.0.2 --- dependencyManagement/build.gradle.kts | 12 +++--- .../javaagent/build.gradle.kts | 8 ++++ .../dropwizard-testing/build.gradle.kts | 12 +++++- .../grails-3.0/javaagent/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 10 ++++- .../library/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 16 +++++++ .../spring-kafka-2.7/library/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 10 ++++- .../spring-rmi-4.0/javaagent/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 8 ++++ .../javaagent/build.gradle.kts | 8 ++++ .../library/build.gradle.kts | 8 ++++ .../spring-ws-2.0/javaagent/build.gradle.kts | 8 ++++ .../vaadin-14.2/javaagent/build.gradle.kts | 42 ++++++++++++++++++- .../build.gradle.kts | 6 +-- licenses/licenses.md | 6 +-- 18 files changed, 176 insertions(+), 18 deletions(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 8990e6bb67d2..eaf2c29033b5 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -59,18 +59,18 @@ val CORE_DEPENDENCIES = listOf( "org.mockito:mockito-core:4.8.0", "org.mockito:mockito-junit-jupiter:4.8.0", "org.mockito:mockito-inline:4.8.0", - "org.slf4j:slf4j-api:1.7.36", - "org.slf4j:slf4j-simple:1.7.36", - "org.slf4j:log4j-over-slf4j:1.7.36", - "org.slf4j:jcl-over-slf4j:1.7.36", - "org.slf4j:jul-to-slf4j:1.7.36" + "org.slf4j:slf4j-api:2.0.2", + "org.slf4j:slf4j-simple:2.0.2", + "org.slf4j:log4j-over-slf4j:2.0.2", + "org.slf4j:jcl-over-slf4j:2.0.2", + "org.slf4j:jul-to-slf4j:2.0.2" ) // See the comment above about why we keep this rather large list. // There are dependencies included here that appear to have no usages, but are maintained at // this top level to help consistently satisfy large numbers of transitive dependencies. val DEPENDENCIES = listOf( - "ch.qos.logback:logback-classic:1.2.11", + "ch.qos.logback:logback-classic:1.3.1", // 1.4+ requires Java 11+ "com.github.stefanbirkner:system-lambda:1.2.1", "com.github.stefanbirkner:system-rules:1.19.0", "uk.org.webcompere:system-stubs-jupiter:2.0.1", diff --git a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts index 7142429fdeaa..4b0d3b77aebe 100644 --- a/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts +++ b/instrumentation/apache-camel-2.20/javaagent/build.gradle.kts @@ -73,3 +73,11 @@ tasks { jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts b/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts index 787961ad4096..aef551a103c2 100644 --- a/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts +++ b/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts @@ -13,5 +13,13 @@ dependencies { testImplementation("com.fasterxml.jackson.module:jackson-module-afterburner") } -// Requires old Guava. Can't use enforcedPlatform since predates BOM -configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0") +configurations.testRuntimeClasspath { + resolutionStrategy { + // Requires old Guava. Can't use enforcedPlatform since predates BOM + force("com.google.guava:guava:19.0") + + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/grails-3.0/javaagent/build.gradle.kts b/instrumentation/grails-3.0/javaagent/build.gradle.kts index f0e1d1b33557..a8bb9c690d9d 100644 --- a/instrumentation/grails-3.0/javaagent/build.gradle.kts +++ b/instrumentation/grails-3.0/javaagent/build.gradle.kts @@ -54,6 +54,14 @@ configurations.configureEach { } } +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + tasks.withType().configureEach { // required on jdk17 jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") diff --git a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts index fb0ca310abe1..87188f0f8fb3 100644 --- a/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts @@ -24,3 +24,11 @@ tasks.withType().configureEach { jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts index ccef2d4d5889..0164503680b1 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts @@ -70,6 +70,14 @@ tasks { withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + } +} + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") } } diff --git a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts index 1e07bf01d62f..0631b4be1cfe 100644 --- a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts @@ -22,3 +22,11 @@ tasks { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts index 31414a6f28a1..b804338a4a16 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts @@ -65,3 +65,19 @@ tasks { dependsOn(testing.suites) } } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + +configurations.named("testNoReceiveTelemetryRuntimeClasspath") { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts index 27aa0e7ab0f2..e2624d5feefd 100644 --- a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts @@ -19,3 +19,11 @@ dependencies { testLibrary("org.springframework.boot:spring-boot-starter-test:2.5.3") testLibrary("org.springframework.boot:spring-boot-starter:2.5.3") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts index 09f0bf372934..cf21a5dfcfd9 100644 --- a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts @@ -25,6 +25,14 @@ dependencies { tasks { test { - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + } +} + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") } } diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts index f601432a9cb7..ae12de7ae749 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts @@ -25,3 +25,11 @@ dependencies { tasks.withType().configureEach { jvmArgs("-Djava.rmi.server.hostname=127.0.0.1") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts index adb4939375bc..3d612fdf614d 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/build.gradle.kts @@ -68,3 +68,11 @@ tasks.withType().configureEach { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts index 88b91fbffaf9..f615912ca43e 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/build.gradle.kts @@ -54,3 +54,11 @@ tasks.withType().configureEach { jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-webmvc-5.3/library/build.gradle.kts b/instrumentation/spring/spring-webmvc-5.3/library/build.gradle.kts index e8af381e4d6b..920cebcbeab5 100644 --- a/instrumentation/spring/spring-webmvc-5.3/library/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc-5.3/library/build.gradle.kts @@ -15,3 +15,11 @@ dependencies { exclude("org.junit.vintage", "junit-vintage-engine") } } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts index c937f71c22a6..1a5338d0ba95 100644 --- a/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts @@ -52,3 +52,11 @@ tasks.withType().configureEach { jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED") jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts index 027c0c21bb9b..70cd2095d289 100644 --- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts +++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts @@ -46,7 +46,7 @@ tasks { if (findProperty("testLatestDeps") as Boolean) { dependsOn(vaadin14LatestTest) } - usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) } } @@ -72,3 +72,43 @@ dependencies { // add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:+") add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.1.+") } + +configurations.testRuntimeClasspath { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + +configurations.named("vaadin142TestRuntimeClasspath") { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + +configurations.named("vaadin14LatestTestRuntimeClasspath") { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + +configurations.named("vaadin16TestRuntimeClasspath") { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} + +configurations.named("latestDepTestRuntimeClasspath") { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } +} diff --git a/javaagent-internal-logging-simple/build.gradle.kts b/javaagent-internal-logging-simple/build.gradle.kts index eb4b32671d47..125653c86421 100644 --- a/javaagent-internal-logging-simple/build.gradle.kts +++ b/javaagent-internal-logging-simple/build.gradle.kts @@ -9,14 +9,12 @@ plugins { group = "io.opentelemetry.javaagent" -val agentSlf4jVersion = "2.0.0" - dependencies { compileOnly(project(":javaagent-bootstrap")) compileOnly(project(":javaagent-tooling")) - implementation("org.slf4j:slf4j-api:$agentSlf4jVersion") - implementation("org.slf4j:slf4j-simple:$agentSlf4jVersion") + implementation("org.slf4j:slf4j-api") + implementation("org.slf4j:slf4j-simple") annotationProcessor("com.google.auto.service:auto-service") compileOnly("com.google.auto.service:auto-service-annotations") diff --git a/licenses/licenses.md b/licenses/licenses.md index fdc1d3d51aba..14efe90d4912 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ #javaagent ##Dependency License Report -_2022-09-26 15:38:28 PDT_ +_2022-09-28 14:05:54 PDT_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -201,11 +201,11 @@ _2022-09-26 15:38:28 PDT_ ## MIT License -**44** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.0` +**44** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.2` > - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**45** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.0` +**45** **Group:** `org.slf4j` **Name:** `slf4j-simple` **Version:** `2.0.2` > - **POM Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) From 8fca46358cf455f16a836ca10cd9363761f16cd3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 5 Oct 2022 13:39:42 -0700 Subject: [PATCH 2/3] reuse --- .../javaagent/build.gradle.kts | 26 +++++---- .../vaadin-14.2/javaagent/build.gradle.kts | 53 ++++++------------- 2 files changed, 27 insertions(+), 52 deletions(-) diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts index b804338a4a16..a52f4ecc990a 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts @@ -66,18 +66,16 @@ tasks { } } -configurations.testRuntimeClasspath { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } -} - -configurations.named("testNoReceiveTelemetryRuntimeClasspath") { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } +configurations { + listOf(testRuntimeClasspath, + named("testNoReceiveTelemetryRuntimeClasspath")) + .forEach { + it.configure { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } + } + } } diff --git a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts index 70cd2095d289..c1bd0a38aaea 100644 --- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts +++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts @@ -73,42 +73,19 @@ dependencies { add("latestDepTestImplementation", "com.vaadin:vaadin-spring-boot-starter:23.1.+") } -configurations.testRuntimeClasspath { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } -} - -configurations.named("vaadin142TestRuntimeClasspath") { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } -} - -configurations.named("vaadin14LatestTestRuntimeClasspath") { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } -} - -configurations.named("vaadin16TestRuntimeClasspath") { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } -} - -configurations.named("latestDepTestRuntimeClasspath") { - resolutionStrategy { - // requires old logback (and therefore also old slf4j) - force("ch.qos.logback:logback-classic:1.2.11") - force("org.slf4j:slf4j-api:1.7.36") - } +configurations { + listOf(testRuntimeClasspath, + named("vaadin142TestRuntimeClasspath"), + named("vaadin14LatestTestRuntimeClasspath"), + named("vaadin16TestRuntimeClasspath"), + named("latestDepTestRuntimeClasspath")) + .forEach { + it.configure { + resolutionStrategy { + // requires old logback (and therefore also old slf4j) + force("ch.qos.logback:logback-classic:1.2.11") + force("org.slf4j:slf4j-api:1.7.36") + } + } + } } From 9b844cb511e37236e754cdb2c858bf1c718beb58 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 5 Oct 2022 17:09:20 -0700 Subject: [PATCH 3/3] Spotless --- .../spring/spring-kafka-2.7/javaagent/build.gradle.kts | 6 ++++-- instrumentation/vaadin-14.2/javaagent/build.gradle.kts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts index a52f4ecc990a..bee6cdf1960c 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts @@ -67,8 +67,10 @@ tasks { } configurations { - listOf(testRuntimeClasspath, - named("testNoReceiveTelemetryRuntimeClasspath")) + listOf( + testRuntimeClasspath, + named("testNoReceiveTelemetryRuntimeClasspath") + ) .forEach { it.configure { resolutionStrategy { diff --git a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts index c1bd0a38aaea..7b0643c2c99b 100644 --- a/instrumentation/vaadin-14.2/javaagent/build.gradle.kts +++ b/instrumentation/vaadin-14.2/javaagent/build.gradle.kts @@ -74,11 +74,13 @@ dependencies { } configurations { - listOf(testRuntimeClasspath, + listOf( + testRuntimeClasspath, named("vaadin142TestRuntimeClasspath"), named("vaadin14LatestTestRuntimeClasspath"), named("vaadin16TestRuntimeClasspath"), - named("latestDepTestRuntimeClasspath")) + named("latestDepTestRuntimeClasspath") + ) .forEach { it.configure { resolutionStrategy {