Skip to content

Commit 373224c

Browse files
fix(deps): update dependency org.assertj:assertj-core to v3.26.0 (main) (#11458)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent a0de9c4 commit 373224c

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

conventions/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ dependencies {
7474
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
7575
testImplementation("org.junit.jupiter:junit-jupiter-api")
7676
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
77-
testImplementation("org.assertj:assertj-core:3.25.3")
77+
testImplementation("org.assertj:assertj-core:3.26.0")
7878
}

dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
104104
"io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
105105
"io.opentelemetry.proto:opentelemetry-proto:1.3.1-alpha",
106106
"io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
107-
"org.assertj:assertj-core:3.25.3",
107+
"org.assertj:assertj-core:3.26.0",
108108
"org.awaitility:awaitility:4.2.1",
109109
"com.google.code.findbugs:annotations:3.0.1u2",
110110
"com.google.code.findbugs:jsr305:3.0.2",

examples/distro/gradle/instrumentation.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// test dependencies
2626
testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
2727
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
28-
testImplementation("org.assertj:assertj-core:3.25.3")
28+
testImplementation("org.assertj:assertj-core:3.26.0")
2929

3030
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
3131
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")

gradle-plugins/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies {
4141

4242
implementation("com.github.johnrengelman:shadow:8.1.1")
4343

44-
testImplementation("org.assertj:assertj-core:3.25.3")
44+
testImplementation("org.assertj:assertj-core:3.26.0")
4545

4646
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
4747
testImplementation("org.junit.jupiter:junit-jupiter-api")

instrumentation/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ class RmiTest {
3434
public static final AgentInstrumentationExtension testing =
3535
AgentInstrumentationExtension.create();
3636

37-
private static int registryPort;
3837
private static Registry serverRegistry;
3938
private static Registry clientRegistry;
4039

4140
@RegisterExtension final AutoCleanupExtension autoCleanup = AutoCleanupExtension.create();
4241

4342
@BeforeAll
4443
static void setUp() throws Exception {
45-
registryPort = PortUtils.findOpenPort();
44+
int registryPort = PortUtils.findOpenPort();
4645
serverRegistry = LocateRegistry.createRegistry(registryPort);
4746
clientRegistry = LocateRegistry.getRegistry("localhost", registryPort);
4847
}
@@ -120,14 +119,14 @@ void serviceThrownException() throws Exception {
120119

121120
Throwable thrown =
122121
catchThrowableOfType(
122+
IllegalStateException.class,
123123
() ->
124124
testing.runWithSpan(
125125
"parent",
126126
() -> {
127127
Greeter client = (Greeter) clientRegistry.lookup(Server.RMI_ID);
128128
client.exceptional();
129-
}),
130-
IllegalStateException.class);
129+
}));
131130

132131
assertThat(testing.waitForTraces(1))
133132
.satisfiesExactly(

0 commit comments

Comments
 (0)