Skip to content

Commit b70e529

Browse files
committed
(chore) update from review
1 parent 9e0c64a commit b70e529

File tree

1 file changed

+2
-19
lines changed

1 file changed

+2
-19
lines changed

Diff for: instrumentation/ratpack/ratpack-1.7/javaagent/build.gradle.kts

+2-19
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,17 @@ dependencies {
1414
library("io.ratpack:ratpack-core:1.7.0")
1515

1616
implementation(project(":instrumentation:netty:netty-4.1:library"))
17-
implementation(project(":instrumentation:ratpack:ratpack-1.4:javaagent"))
1817
implementation(project(":instrumentation:ratpack:ratpack-1.7:library"))
1918

20-
testImplementation(project(":instrumentation:ratpack:ratpack-1.4:testing"))
21-
2219
testLibrary("io.ratpack:ratpack-test:1.7.0")
20+
testImplementation(project(":instrumentation:ratpack:ratpack-1.4:testing"))
21+
testInstrumentation(project(":instrumentation:ratpack:ratpack-1.4:javaagent"))
2322

2423
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) {
2524
testImplementation("com.sun.activation:jakarta.activation:1.2.2")
2625
}
2726
}
2827

29-
// to allow all tests to pass we need to choose a specific netty version
30-
if (!(findProperty("testLatestDeps") as Boolean)) {
31-
configurations.configureEach {
32-
if (!name.contains("muzzle")) {
33-
resolutionStrategy {
34-
eachDependency {
35-
// specifying a fixed version for all libraries with io.netty group
36-
if (requested.group == "io.netty" && requested.name != "netty-tcnative") {
37-
useVersion("4.1.37.Final")
38-
}
39-
}
40-
}
41-
}
42-
}
43-
}
44-
4528
tasks {
4629
withType<Test>().configureEach {
4730
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)

0 commit comments

Comments
 (0)