Merge branch '3.0.x' into 3.1.x

Closes gh-37661
2023-10-03 10:57:28 +01:00
parent 904bd52260 931584f8af
commit a4100e12ff
17 changed files with 31 additions and 31 deletions
--- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/test/AbstractDockerComposeIntegrationTests.java
@@ -38,7 +38,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.function.ThrowingSupplier;

-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.fail;

 /**
 * Abstract base class for integration tests.