Merge branch '2.4.x'

Author: philwebb

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java

@@ -163,6 +163,7 @@ protected ReactiveWebOperation wrapReactiveWebOperation(ExposableWebEndpoint end
 		return reactiveWebOperation;
 	}
 
+	@SuppressWarnings("deprecation")
 	private RequestMappingInfo createRequestMappingInfo(WebOperation operation) {
 		WebOperationRequestPredicate predicate = operation.getRequestPredicate();
 		PatternsRequestCondition patterns = new PatternsRequestCondition(
@@ -176,6 +177,7 @@ private RequestMappingInfo createRequestMappingInfo(WebOperation operation) {
 		return new RequestMappingInfo(null, patterns, methods, null, null, consumes, produces, null);
 	}
 
+	@SuppressWarnings("deprecation")
 	private void registerLinksMapping() {
 		PatternsRequestCondition patterns = new PatternsRequestCondition(
 				pathPatternParser.parse(this.endpointMapping.getPath()));

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java

@@ -101,6 +101,7 @@ private PathPattern getEndpointMappedPattern(ExposableControllerEndpoint endpoin
 		return getPathPatternParser().parse(this.endpointMapping.createSubPath(endpoint.getRootPath() + pattern));
 	}
 
+	@SuppressWarnings("deprecation")
 	private RequestMappingInfo withNewPatterns(RequestMappingInfo mapping, PathPattern[] patterns) {
 		PatternsRequestCondition patternsCondition = new PatternsRequestCondition(patterns);
 		return new RequestMappingInfo(patternsCondition, mapping.getMethodsCondition(), mapping.getParamsCondition(),

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

@@ -1621,14 +1621,14 @@ bom {
 			]
 		}
 	}
-	library("Spring Data Bom", "2021.0.0-M2") {
+	library("Spring Data Bom", "2021.0.0-SNAPSHOT") {
 		group("org.springframework.data") {
 			imports = [
 				"spring-data-bom"
 			]
 		}
 	}
-	library("Spring Framework", "5.3.3") {
+	library("Spring Framework", "5.3.4-SNAPSHOT") {
 		group("org.springframework") {
 			imports = [
 				"spring-framework-bom"

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java

@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
+import java.time.Duration;
 import java.util.Map;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -97,6 +98,11 @@ public void verify() {
 			getDelegate().verify();
 		}
 
+		@Override
+		public void verify(Duration timeout) {
+			getDelegate().verify(timeout);
+		}
+
 		@Override
 		public void reset() {
 			Map<RestTemplate, RequestExpectationManager> expectationManagers = this.customizer.getExpectationManagers();

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/RootUriRequestExpectationManager.java

@@ -20,6 +20,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.time.Duration;
 
 import org.springframework.boot.web.client.RootUriTemplateHandler;
 import org.springframework.http.client.ClientHttpRequest;
@@ -111,6 +112,11 @@ public void verify() {
 		this.expectationManager.verify();
 	}
 
+	@Override
+	public void verify(Duration timeout) {
+		this.expectationManager.verify(timeout);
+	}
+
 	@Override
 	public void reset() {
 		this.expectationManager.reset();