fix(deps): update dependency io.netty:netty-bom to v4.1.104.final (#10058)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
parent
68d7a2eebe
commit
586eea7ed9
|
@ -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.101.Final", false)
|
||||
belongsTo("io.netty:netty-bom:4.1.104.Final", false)
|
||||
} else if (id.version.startsWith("4.0.")) {
|
||||
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
|
||||
}
|
||||
|
|
|
@ -55,6 +55,10 @@ tasks {
|
|||
jvmArgs("-Dotel.semconv-stability.opt-in=http")
|
||||
}
|
||||
|
||||
withType<Test>().configureEach {
|
||||
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
|
||||
}
|
||||
|
||||
check {
|
||||
dependsOn(testStableSemconv)
|
||||
}
|
||||
|
|
|
@ -133,7 +133,10 @@ public abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTe
|
|||
optionsBuilder.setClientSpanErrorMapper(
|
||||
(uri, exception) -> {
|
||||
if (uri.toString().equals("https://192.0.2.1/")) {
|
||||
return new ConnectTimeoutException("connection timed out: /192.0.2.1:443");
|
||||
return new ConnectTimeoutException(
|
||||
"connection timed out"
|
||||
+ (Boolean.getBoolean("testLatestDeps") ? " after 2000 ms" : "")
|
||||
+ ": /192.0.2.1:443");
|
||||
} else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
|
||||
return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61");
|
||||
} else if (uri.getPath().equals("/read-timeout")) {
|
||||
|
|
Loading…
Reference in New Issue