fix(deps): update dependency org.assertj:assertj-core to v3.26.0 (mai…

…n) (#11458) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
open-telemetry · May 27, 2024 · 373224c · 373224c
1 parent a0de9c4
commit 373224c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -74,5 +74,5 @@ dependencies {
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.25.3")
+  testImplementation("org.assertj:assertj-core:3.26.0")
 }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
   "io.opentelemetry.proto:opentelemetry-proto:1.3.1-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
-  "org.assertj:assertj-core:3.25.3",
+  "org.assertj:assertj-core:3.26.0",
   "org.awaitility:awaitility:4.2.1",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",

diff --git a/examples/distro/gradle/instrumentation.gradle b/examples/distro/gradle/instrumentation.gradle
@@ -25,7 +25,7 @@ dependencies {
   // test dependencies
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
-  testImplementation("org.assertj:assertj-core:3.25.3")
+  testImplementation("org.assertj:assertj-core:3.26.0")
 
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")

diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
 
   implementation("com.github.johnrengelman:shadow:8.1.1")
 
-  testImplementation("org.assertj:assertj-core:3.25.3")
+  testImplementation("org.assertj:assertj-core:3.26.0")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.2"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")

diff --git a/...n/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java b/...n/rmi/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/rmi/RmiTest.java
@@ -34,15 +34,14 @@ class RmiTest {
   public static final AgentInstrumentationExtension testing =
       AgentInstrumentationExtension.create();
 
-  private static int registryPort;
   private static Registry serverRegistry;
   private static Registry clientRegistry;
 
   @RegisterExtension final AutoCleanupExtension autoCleanup = AutoCleanupExtension.create();
 
   @BeforeAll
   static void setUp() throws Exception {
-    registryPort = PortUtils.findOpenPort();
+    int registryPort = PortUtils.findOpenPort();
     serverRegistry = LocateRegistry.createRegistry(registryPort);
     clientRegistry = LocateRegistry.getRegistry("localhost", registryPort);
   }
@@ -120,14 +119,14 @@ void serviceThrownException() throws Exception {
 
     Throwable thrown =
         catchThrowableOfType(
+            IllegalStateException.class,
             () ->
                 testing.runWithSpan(
                     "parent",
                     () -> {
                       Greeter client = (Greeter) clientRegistry.lookup(Server.RMI_ID);
                       client.exceptional();
-                    }),
-            IllegalStateException.class);
+                    }));
 
     assertThat(testing.waitForTraces(1))
         .satisfiesExactly(