Merge branch '3.1.x'

Closes gh-37662
2023-10-03 11:21:29 +01:00
parent 3d6859e80f a4100e12ff
commit 7d40a45b50
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}.