Upgrade to Reactor Bom 2024.0.0-M3

Closes gh-41422

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import reactor.core.publisher.Mono;
 import reactor.netty.http.Http11SslContextSpec;
 import reactor.netty.http.client.HttpClient;
+import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 
 import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel;
 import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException;
@@ -69,7 +70,7 @@ protected ReactorClientHttpConnector buildTrustAllSslConnector() {
 		return new ReactorClientHttpConnector(client);
 	}
 
-	private Http11SslContextSpec createSslContextSpec() {
+	private GenericSslContextSpec<?> createSslContextSpec() {
 		return Http11SslContextSpec.forClient()
 			.configure((builder) -> builder.sslProvider(SslProvider.JDK)
 				.trustManager(InsecureTrustManagerFactory.INSTANCE));

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1680,7 +1680,7 @@ bom {
 			]
 		}
 	}
-	library("Reactor Bom", "2023.0.8") {
+	library("Reactor Bom", "2024.0.0-M3") {
 		considerSnapshots()
 		calendarName = "Reactor"
 		group("io.projectreactor") {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java

@@ -33,7 +33,7 @@
 import io.rsocket.transport.netty.server.WebsocketServerTransport;
 import reactor.core.publisher.Mono;
 import reactor.netty.http.server.HttpServer;
-import reactor.netty.tcp.AbstractProtocolSslContextSpec;
+import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 import reactor.netty.tcp.TcpServer;
 
 import org.springframework.boot.context.properties.PropertyMapper;
@@ -234,7 +234,7 @@ private TcpSslServerCustomizer(ClientAuth clientAuth, SslBundle sslBundle,
 		}
 
 		private TcpServer apply(TcpServer server) {
-			AbstractProtocolSslContextSpec<?> sslContextSpec = createSslContextSpec(this.sslBundle);
+			GenericSslContextSpec<?> sslContextSpec = createSslContextSpec(this.sslBundle);
 			return server.secure((spec) -> spec.sslContext(sslContextSpec));
 		}
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java

@@ -27,6 +27,7 @@
 import reactor.netty.http.server.HttpServer;
 import reactor.netty.tcp.AbstractProtocolSslContextSpec;
 import reactor.netty.tcp.SslProvider;
+import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 import reactor.netty.tcp.SslProvider.SslContextSpec;
 
 import org.springframework.boot.ssl.SslBundle;
@@ -102,7 +103,7 @@ private Map<String, SslProvider> createServerNameSslProviders(Map<String, SslBun
 	}
 
 	private SslProvider createSslProvider(SslBundle sslBundle) {
-		return SslProvider.builder().sslContext(createSslContextSpec(sslBundle)).build();
+		return SslProvider.builder().sslContext((GenericSslContextSpec<?>) createSslContextSpec(sslBundle)).build();
 	}
 
 	/**

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@
 import reactor.core.publisher.Mono;
 import reactor.netty.http.Http11SslContextSpec;
 import reactor.netty.http.client.HttpClient;
+import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 import reactor.netty.tcp.TcpClient;
 import reactor.test.StepVerifier;
 
@@ -349,7 +350,7 @@ private RSocketRequester createSecureRSocketWebSocketClient() {
 
 	private HttpClient createSecureHttpClient() {
 		HttpClient httpClient = createHttpClient();
-		Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient()
+		GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
 			.configure((builder) -> builder.sslProvider(SslProvider.JDK)
 				.trustManager(InsecureTrustManagerFactory.INSTANCE));
 		return httpClient.secure((spec) -> spec.sslContext(sslContextSpec));
@@ -363,7 +364,7 @@ private HttpClient createHttpClient() {
 
 	private TcpClient createSecureTcpClient() {
 		TcpClient tcpClient = createTcpClient();
-		Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient()
+		GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
 			.configure((builder) -> builder.sslProvider(SslProvider.JDK)
 				.trustManager(InsecureTrustManagerFactory.INSTANCE));
 		return tcpClient.secure((spec) -> spec.sslContext(sslContextSpec));

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java

@@ -52,6 +52,7 @@
 import reactor.netty.NettyPipeline;
 import reactor.netty.http.Http11SslContextSpec;
 import reactor.netty.http.client.HttpClient;
+import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
 import reactor.test.StepVerifier;
 
 import org.springframework.boot.web.server.Compression;
@@ -246,7 +247,7 @@ protected void assertThatSslWithInvalidAliasCallFails(ThrowingCallable call) {
 	}
 
 	protected ReactorClientHttpConnector buildTrustAllSslConnector() {
-		Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient()
+		GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
 			.configure((builder) -> builder.sslProvider(SslProvider.JDK)
 				.trustManager(InsecureTrustManagerFactory.INSTANCE));
 		HttpClient client = HttpClient.create().wiretap(true).secure((spec) -> spec.sslContext(sslContextSpec));
@@ -285,7 +286,7 @@ protected ReactorClientHttpConnector buildTrustAllSslWithClientKeyConnector(Stri
 			.getInstance(KeyManagerFactory.getDefaultAlgorithm());
 		clientKeyManagerFactory.init(clientKeyStore, keyStorePassword.toCharArray());
 
-		Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient()
+		GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
 			.configure((builder) -> builder.sslProvider(SslProvider.JDK)
 				.trustManager(InsecureTrustManagerFactory.INSTANCE)
 				.keyManager(clientKeyManagerFactory));