Merge branch '6.2.x'

sbrannen · Jan 3, 2025 · bab8a83 · bab8a83
2 parents b6de2b0 + 9de2b94
commit bab8a83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
@@ -15,13 +15,13 @@ dependencies {
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.24"))
 	api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
-	api(platform("org.assertj:assertj-bom:3.27.0"))
+	api(platform("org.assertj:assertj-bom:3.27.1"))
 	api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
 	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"))
 	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"))
 	api(platform("org.junit:junit-bom:5.11.4"))
-	api(platform("org.mockito:mockito-bom:5.14.2"))
+	api(platform("org.mockito:mockito-bom:5.15.2"))
 
 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")

diff --git a/.../src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java b/.../src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java
@@ -97,7 +97,7 @@ void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
 			assertThat(throwableSeenByInterceptor).isSameAs(undeclaredCheckedException);
 			assertThat(throwableSeenByCaller)
 					.isInstanceOf(UndeclaredThrowableException.class)
-					.hasCauseReference(undeclaredCheckedException);
+					.cause().isSameAs(undeclaredCheckedException);
 		}
 
 		@Test
@@ -145,7 +145,7 @@ void targetThrowsUndeclaredCheckedException() throws DeclaredCheckedException {
 			invokeProxy();
 			assertThat(throwableSeenByCaller)
 					.isInstanceOf(UndeclaredThrowableException.class)
-					.hasCauseReference(undeclaredCheckedException);
+					.cause().isSameAs(undeclaredCheckedException);
 		}
 
 		@Test