Merge branch '3.3.x' into 3.4.x

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/FileWatcherTests.java

@@ -289,6 +289,8 @@ void shouldTriggerOnConfigMapUpdates(@TempDir Path tempDir) throws Exception {
 	 * <li>Performs an atomic rename of {@code ..data_tmp} to {@code ..data}.</li>
 	 * <li>Deletes the old ConfigMap/Secret directory.</li>
 	 * </ul>
+	 * @param tempDir temp directory
+	 * @throws Exception if a failure occurs
 	 */
 	@Test
 	void shouldTriggerOnConfigMapAtomicMoveUpdates(@TempDir Path tempDir) throws Exception {