Merge branch '3.3.x'

Closes gh-42082

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java

@@ -121,6 +121,7 @@ Consumer<TotalProgressEvent> pullingImage(ImageReference imageReference, ImagePl
 	 * Log that a cache cleanup step was not completed successfully.
 	 * @param cache the cache
 	 * @param exception any exception that caused the failure
+	 * @since 3.2.6
 	 */
 	void failedCleaningWorkDir(Cache cache, Exception exception);
 

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java

@@ -337,9 +337,9 @@ void buildsImageWithBindCaches() throws IOException {
 		cleanupCache(launchCachePath);
 	}
 
-	private static void cleanupCache(Path buildCachePath) {
+	private static void cleanupCache(Path cachePath) {
 		try {
-			FileSystemUtils.deleteRecursively(buildCachePath);
+			FileSystemUtils.deleteRecursively(cachePath);
 		}
 		catch (Exception ex) {
 			// ignore

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java

@@ -464,9 +464,9 @@ void whenBuildImageIsInvokedWithBindCaches(MavenBuild mavenBuild) {
 			});
 	}
 
-	private static void cleanupCache(Path buildCachePath) {
+	private static void cleanupCache(Path cachePath) {
 		try {
-			FileSystemUtils.deleteRecursively(buildCachePath);
+			FileSystemUtils.deleteRecursively(cachePath);
 		}
 		catch (Exception ex) {
 			// ignore