Skip to content

Commit

Permalink
Fix ratpack netty version
Browse files Browse the repository at this point in the history
  • Loading branch information
jsalinaspolo committed Dec 2, 2021
1 parent 2a3c630 commit 8534d3f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 36 deletions.
20 changes: 1 addition & 19 deletions instrumentation/ratpack-1.7/javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ muzzle {
pass {
group.set("io.ratpack")
module.set("ratpack-core")
versions.set("[1.4.0,)")
versions.set("[1.7.0,)")
}
}

Expand All @@ -24,21 +24,3 @@ dependencies {
}
}

// Requires old Guava. Can't use enforcedPlatform since predates BOM
configurations.testRuntimeClasspath.resolutionStrategy.force("com.google.guava:guava:19.0")

// 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") {
useVersion("4.1.31.Final")
}
}
}
}
}
}
17 changes: 0 additions & 17 deletions instrumentation/ratpack-1.7/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ dependencies {

testImplementation(project(":instrumentation:ratpack-1.7:testing"))

// 1.4.0 has a bug which makes tests flaky
// (https://github.com/ratpack/ratpack/commit/dde536ac138a76c34df03a0642c88d64edde688e)
testLibrary("io.ratpack:ratpack-test:1.7.0")
testLibrary("io.ratpack:ratpack-guice:1.7.0")

Expand All @@ -18,18 +16,3 @@ dependencies {
}
}

// 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") {
useVersion("4.1.63.Final")
}
}
}
}
}
}

0 comments on commit 8534d3f

Please sign in to comment.