From e73e7564d05fcf14f49847ab2d956644a2adde80 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 3 Jan 2025 16:36:39 +0200 Subject: [PATCH 1/2] Upgrade to Mockito 5.15.2 --- framework-platform/framework-platform.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 51228b9578a..aacbb598972 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -21,7 +21,7 @@ dependencies { api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.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") From 9de2b947cbe5b1d9d1d689c644059e82ce8bc144 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 3 Jan 2025 16:39:28 +0200 Subject: [PATCH 2/2] Upgrade to AssertJ 3.27.1 --- framework-platform/framework-platform.gradle | 2 +- .../aop/framework/AbstractProxyExceptionHandlingTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index aacbb598972..2caf0f24a95 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,7 +15,7 @@ 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:2.21.1")) - 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.8.1")) diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java index 6b3e34cba86..b03cc7f9a98 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java @@ -99,7 +99,7 @@ abstract class AbstractProxyExceptionHandlingTests { assertThat(throwableSeenByInterceptor).isSameAs(undeclaredCheckedException); assertThat(throwableSeenByCaller) .isInstanceOf(UndeclaredThrowableException.class) - .hasCauseReference(undeclaredCheckedException); + .cause().isSameAs(undeclaredCheckedException); } @Test @@ -147,7 +147,7 @@ abstract class AbstractProxyExceptionHandlingTests { invokeProxy(); assertThat(throwableSeenByCaller) .isInstanceOf(UndeclaredThrowableException.class) - .hasCauseReference(undeclaredCheckedException); + .cause().isSameAs(undeclaredCheckedException); } @Test