(chore) update from review

open-telemetry · Nov 6, 2024 · 0a9215b · 0a9215b
1 parent 9e0c64a
commit 0a9215b
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/instrumentation/ratpack/ratpack-1.7/javaagent/build.gradle.kts b/instrumentation/ratpack/ratpack-1.7/javaagent/build.gradle.kts
@@ -14,34 +14,17 @@ dependencies {
   library("io.ratpack:ratpack-core:1.7.0")
 
   implementation(project(":instrumentation:netty:netty-4.1:library"))
-  implementation(project(":instrumentation:ratpack:ratpack-1.4:javaagent"))
   implementation(project(":instrumentation:ratpack:ratpack-1.7:library"))
 
-  testImplementation(project(":instrumentation:ratpack:ratpack-1.4:testing"))
-
   testLibrary("io.ratpack:ratpack-test:1.7.0")
+  testImplementation(project(":instrumentation:ratpack:ratpack-1.4:testing"))
+  testInstrumentation(project(":instrumentation:ratpack:ratpack-1.4:javaagent"))
 
   if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
     testImplementation("com.sun.activation:jakarta.activation:1.2.2")
   }
 }
 
-// to allow all tests to pass we need to choose a specific netty version
-if (!(findProperty("testLatestDeps") as Boolean)) {
-  configurations.configureEach {
-    if (!name.contains("muzzle")) {
-      resolutionStrategy {
-        eachDependency {
-          // specifying a fixed version for all libraries with io.netty group
-          if (requested.group == "io.netty" && requested.name != "netty-tcnative") {
-            useVersion("4.1.37.Final")
-          }
-        }
-      }
-    }
-  }
-}
-
 tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)