Merge branch '6.1.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

spring-web/src/main/java/org/springframework/http/CacheControl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-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.
@@ -393,7 +393,7 @@ public class CacheControl {
 	}
 
 	private void appendDirective(StringBuilder builder, String value) {
-		if (builder.length() > 0) {
+		if (!builder.isEmpty()) {
 			builder.append(", ");
 		}
 		builder.append(value);

spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java

@@ -245,8 +245,7 @@ public final class WebAsyncManager {
 	}
 
 	/**
-	 * Mark the {@link WebAsyncManager} as wrapping a
-	 * multipart async request.
+	 * Mark the {@link WebAsyncManager} as wrapping a multipart async request.
 	 * @since 6.1.12
 	 */
 	public void setMultipartRequestParsed(boolean isMultipart) {