From 64daba34de543d7fd3728c89ee6020bd774b448b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 28 Sep 2024 20:35:50 +0900 Subject: [PATCH 1/2] Upgrade to Awaitility 4.2.2 See gh-33143 Closes gh-33604 --- 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 f3d8824e19..a20d11df7e 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -111,7 +111,7 @@ dependencies { api("org.aspectj:aspectjrt:1.9.22.1") api("org.aspectj:aspectjtools:1.9.22.1") api("org.aspectj:aspectjweaver:1.9.22.1") - api("org.awaitility:awaitility:4.2.0") + api("org.awaitility:awaitility:4.2.2") api("org.bouncycastle:bcpkix-jdk18on:1.72") api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") From 0b3b1391c1de87c171b50b143dcbd48e1c021354 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 27 May 2024 16:51:39 +0200 Subject: [PATCH 2/2] Avoid usage of deprecated AssertJ feature --- .../java/org/springframework/validation/DataBinderTests.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index e34cbe78b2..81ee18a8a4 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -36,7 +36,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeSet; -import org.assertj.core.api.IntegerAssert; import org.junit.jupiter.api.Test; import org.springframework.beans.BeanWrapper; @@ -2042,7 +2041,7 @@ class DataBinderTests { binder.bind(pvs); assertThat(tb.getIntegerList()).hasSize(257); - assertThat(tb.getIntegerList(), IntegerAssert.class).element(256).isEqualTo(1); + assertThat(tb.getIntegerList()).element(256).isEqualTo(1); assertThat(binder.getBindingResult().getFieldValue("integerList[256]")).isEqualTo(1); }