Merge branch '2023.0.x' into 2024.0.x

Author: ryanjbaxter

docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java

@@ -20,9 +20,10 @@
 import java.nio.file.Files;
 
 import org.assertj.core.api.BDDAssertions;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Fail.fail;
+
 class ZipCategoryTests {
 
 	@Test
@@ -49,7 +50,7 @@ void should_not_allow_malicious_traversal() throws Exception {
 		// when:
 		try {
 			ZipCategory.unzipTo(zipFile, tempDir);
-			Assertions.fail("Should throw exception");
+			fail("Should throw exception");
 		}
 		catch (Exception e) {
 			BDDAssertions.then(e.getCause()).hasMessageContaining("is trying to leave the target output directory");