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-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableTests.java
@@ -18,7 +18,7 @@ package org.springframework.boot.testsupport.process;

 import org.junit.jupiter.api.Test;

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

 /**
 * Tests for {@link DisabledIfProcessUnavailable}.