Merge branch '6.0.x'

# Conflicts:
#	spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java
#	spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java

Author: jhoeller

framework-platform/framework-platform.gradle

@@ -128,7 +128,7 @@ dependencies {
 		api("org.hamcrest:hamcrest:2.2")
 		api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
 		api("org.hibernate:hibernate-validator:7.0.5.Final")
-		api("org.hsqldb:hsqldb:2.7.1")
+		api("org.hsqldb:hsqldb:2.7.2")
 		api("org.javamoney:moneta:1.4.2")
 		api("org.jruby:jruby:9.4.3.0")
 		api("org.junit.support:testng-engine:1.0.4")
@@ -142,7 +142,7 @@ dependencies {
 		api("org.slf4j:slf4j-api:2.0.7")
 		api("org.testng:testng:7.8.0")
 		api("org.webjars:underscorejs:1.8.3")
-		api("org.webjars:webjars-locator-core:0.52")
+		api("org.webjars:webjars-locator-core:0.53")
 		api("org.xmlunit:xmlunit-assertj:2.9.1")
 		api("org.xmlunit:xmlunit-matchers:2.9.1")
 		api("org.yaml:snakeyaml:2.0")

spring-messaging/src/main/java/org/springframework/messaging/handler/HandlerMethod.java

@@ -189,7 +189,7 @@ public HandlerMethod createWithResolvedBean() {
 	 * Return a short representation of this handler method for log message purposes.
 	 */
 	public String getShortLogMessage() {
-		return getBeanType().getName() + "#" + getMethod().getName() +
+		return getBeanType().getSimpleName() + "#" + getMethod().getName() +
 				"[" + getMethod().getParameterCount() + " args]";
 	}