Merge branch '4.2.x'

Author: ryanjbaxter

Diff for: spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/CustomBlockHoundIntegrationTest.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.gateway.test;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
@@ -30,6 +31,8 @@ public class CustomBlockHoundIntegrationTest {
 
 	@Test
 	@DisabledForJreRange(min = JRE.JAVA_18)
+	// Disable this test for now flaky on GitHub Actions
+	@Disabled
 	public void shouldThrowErrorForBlockingCallWithCustomBlockHoundIntegration() {
 		Assertions.assertThrows(RuntimeException.class, () -> Mono.fromCallable(() -> {
 			Thread.sleep(1);