From 27ee816a26c340d2d5fe94904435e6b19d84cda3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 10:20:54 -0800 Subject: [PATCH] fix(deps): update dependency io.netty:netty-bom to v4.1.101.final (#9833) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin --- .../main/kotlin/otel.java-conventions.gradle.kts | 2 +- instrumentation/grpc-1.6/javaagent/build.gradle.kts | 13 +++++++++++++ instrumentation/grpc-1.6/library/build.gradle.kts | 13 +++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 19fa1f8185..7771231545 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -122,7 +122,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule { with(ctx.details) { if (id.group == "io.netty" && id.name != "netty") { if (id.version.startsWith("4.1.")) { - belongsTo("io.netty:netty-bom:4.1.100.Final", false) + belongsTo("io.netty:netty-bom:4.1.101.Final", false) } else if (id.version.startsWith("4.0.")) { belongsTo("io.netty:netty-bom:4.0.56.Final", false) } diff --git a/instrumentation/grpc-1.6/javaagent/build.gradle.kts b/instrumentation/grpc-1.6/javaagent/build.gradle.kts index a25ad45d21..e9ed7bdff4 100644 --- a/instrumentation/grpc-1.6/javaagent/build.gradle.kts +++ b/instrumentation/grpc-1.6/javaagent/build.gradle.kts @@ -44,3 +44,16 @@ tasks { } } } + +if (!(findProperty("testLatestDeps") as Boolean)) { + configurations.testRuntimeClasspath { + resolutionStrategy { + eachDependency { + // early versions of grpc are not compatible with netty 4.1.101.Final + if (requested.group == "io.netty") { + useVersion("4.1.100.Final") + } + } + } + } +} diff --git a/instrumentation/grpc-1.6/library/build.gradle.kts b/instrumentation/grpc-1.6/library/build.gradle.kts index 807f6950a2..18f55a3a33 100644 --- a/instrumentation/grpc-1.6/library/build.gradle.kts +++ b/instrumentation/grpc-1.6/library/build.gradle.kts @@ -21,3 +21,16 @@ tasks { systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) } } + +if (!(findProperty("testLatestDeps") as Boolean)) { + configurations.testRuntimeClasspath { + resolutionStrategy { + eachDependency { + // early versions of grpc are not compatible with netty 4.1.101.Final + if (requested.group == "io.netty") { + useVersion("4.1.100.Final") + } + } + } + } +}