Merge branch '3.1.x' into 3.2.x

Closes gh-40702

Author: mhalbritter

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -84,8 +84,8 @@
  * <ul>
  * <li>Use {@code -parameters}.
  * <li>Treat warnings as errors
- * <li>Enable {@code unchecked}, {@code deprecation}, {@code rawtypes}, and {@code varags}
- * warnings
+ * <li>Enable {@code unchecked}, {@code deprecation}, {@code rawtypes}, and
+ * {@code varargs} warnings
  * </ul>
  * <li>{@link Jar} tasks are configured to produce jars with LICENSE.txt and NOTICE.txt
  * files and the following manifest entries: