root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-01-03 16:44:26 +02:00
parent b6de2b0611 9de2b947cb
commit bab8a8300b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework-platform/framework-platform.gradle
View File

@ -15,13 +15,13 @@ dependencies {
api(platform("io.rsocket:rsocket-bom:1.1.4")) api(platform("io.rsocket:rsocket-bom:1.1.4"))
api(platform("org.apache.groovy:groovy-bom:4.0.24")) 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.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:jetty-bom:12.0.15"))
api(platform("org.eclipse.jetty.ee10:jetty-ee10-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-coroutines-bom:1.9.0"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"))
api(platform("org.junit:junit-bom:5.11.4")) 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 { constraints {
api("com.fasterxml:aalto-xml:1.3.2") api("com.fasterxml:aalto-xml:1.3.2")

4
spring-aop/src/test/java/org/springframework/aop/framework/AbstractProxyExceptionHandlingTests.java
View File

@ -97,7 +97,7 @@ abstract class AbstractProxyExceptionHandlingTests {
assertThat(throwableSeenByInterceptor).isSameAs(undeclaredCheckedException); assertThat(throwableSeenByInterceptor).isSameAs(undeclaredCheckedException);
assertThat(throwableSeenByCaller) assertThat(throwableSeenByCaller)
.isInstanceOf(UndeclaredThrowableException.class) .isInstanceOf(UndeclaredThrowableException.class)
.hasCauseReference(undeclaredCheckedException); .cause().isSameAs(undeclaredCheckedException);
} }
@Test @Test
@ -145,7 +145,7 @@ abstract class AbstractProxyExceptionHandlingTests {
invokeProxy(); invokeProxy();
assertThat(throwableSeenByCaller) assertThat(throwableSeenByCaller)
.isInstanceOf(UndeclaredThrowableException.class) .isInstanceOf(UndeclaredThrowableException.class)
.hasCauseReference(undeclaredCheckedException); .cause().isSameAs(undeclaredCheckedException);
} }
@Test @Test