Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java
#	spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java

Author: jhoeller

framework-platform/framework-platform.gradle

@@ -139,13 +139,13 @@ dependencies {
 		api("org.quartz-scheduler:quartz:2.3.2")
 		api("org.reactivestreams:reactive-streams:1.0.4")
 		api("org.seleniumhq.selenium:htmlunit3-driver:4.33.0")
-		api("org.seleniumhq.selenium:selenium-java:4.33.0")
+		api("org.seleniumhq.selenium:selenium-java:4.34.0")
 		api("org.skyscreamer:jsonassert:2.0-rc1")
 		api("org.testng:testng:7.11.0")
 		api("org.webjars:underscorejs:1.8.3")
 		api("org.webjars:webjars-locator-lite:1.1.0")
-		api("org.xmlunit:xmlunit-assertj:2.10.0")
-		api("org.xmlunit:xmlunit-matchers:2.10.0")
+		api("org.xmlunit:xmlunit-assertj:2.10.3")
+		api("org.xmlunit:xmlunit-matchers:2.10.3")
 		api("org.yaml:snakeyaml:2.4")
 	}
 }

spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java

@@ -197,7 +197,6 @@ else if (statusCode instanceof HttpStatus status) {
 				return HTTP_OUTCOME_UNKNOWN;
 			}
 		}
-
 	}
 
 }

spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java

@@ -195,7 +195,6 @@ else if (statusCode instanceof HttpStatus status) {
 				return HTTP_OUTCOME_UNKNOWN;
 			}
 		}
-
 	}
 
 }