Merge branch '2.4.x'

See gh-25985

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java

@@ -284,8 +284,7 @@ class FileSystemWatcherTests {
 		this.watcher.addSourceDirectory(directory);
 		this.watcher.start();
 		this.watcher.stopAfter(1);
-		ChangedFiles changedFiles = getSingleChangedFiles();
-		Set<ChangedFile> actual = changedFiles.getFiles();
+		Set<ChangedFile> actual = getAllFileChanges();
 		Set<ChangedFile> expected = new HashSet<>();
 		expected.add(new ChangedFile(directory, recreate, Type.ADD));
 		assertThat(actual).isEqualTo(expected);