Merge branch '6.0.x'

spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/AbstractHttpHandlerIntegrationTests.java

@@ -127,7 +127,6 @@ public abstract class AbstractHttpHandlerIntegrationTests {
 		return Stream.of(
 				named("Jetty", new JettyHttpServer()),
 				named("Reactor Netty", new ReactorHttpServer()),
-				named("Reactor Netty 2", new ReactorNetty2HttpServer()),
 				named("Tomcat", new TomcatHttpServer()),
 				named("Undertow", new UndertowHttpServer())
 		);

spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java

@@ -103,7 +103,6 @@ class WebClientIntegrationTests {
 	static Stream<Named<ClientHttpConnector>> arguments() {
 		return Stream.of(
 				named("Reactor Netty", new ReactorClientHttpConnector()),
-				named("Reactor Netty 2", new ReactorNetty2ClientHttpConnector()),
 				named("JDK", new JdkClientHttpConnector()),
 				named("Jetty", new JettyClientHttpConnector()),
 				named("HttpComponents", new HttpComponentsClientHttpConnector())

spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java

@@ -45,7 +45,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.web.filter.reactive.ServerWebExchangeContextFilter;
 import org.springframework.web.reactive.DispatcherHandler;
-import org.springframework.web.reactive.socket.client.ReactorNetty2WebSocketClient;
 import org.springframework.web.reactive.socket.client.ReactorNettyWebSocketClient;
 import org.springframework.web.reactive.socket.client.TomcatWebSocketClient;
 import org.springframework.web.reactive.socket.client.UndertowWebSocketClient;
@@ -64,7 +63,6 @@ import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.JettyHttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorHttpServer;
-import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorNetty2HttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.TomcatHttpServer;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
 
@@ -94,7 +92,6 @@ abstract class AbstractReactiveWebSocketIntegrationTests {
 		WebSocketClient[] clients = new WebSocketClient[] {
 				new TomcatWebSocketClient(),
 				new ReactorNettyWebSocketClient(),
-				new ReactorNetty2WebSocketClient(),
 				new UndertowWebSocketClient(Xnio.getInstance().createWorker(OptionMap.EMPTY))
 		};
 
@@ -102,7 +99,6 @@ abstract class AbstractReactiveWebSocketIntegrationTests {
 		servers.put(new TomcatHttpServer(TMP_DIR.getAbsolutePath(), WsContextListener.class), TomcatConfig.class);
 		servers.put(new JettyHttpServer(), JettyConfig.class);
 		servers.put(new ReactorHttpServer(), ReactorNettyConfig.class);
-		servers.put(new ReactorNetty2HttpServer(), ReactorNetty2Config.class);
 		servers.put(new UndertowHttpServer(), UndertowConfig.class);
 
 		// Try each client once against each server..