Merge branch '3.2.x' into 3.3.x

Closes gh-42081
spring-projects · Sep 2, 2024 · b29bc2d · b29bc2d
2 parents 101ed0e + f587285
commit b29bc2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...ck-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java b/...ck-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java
@@ -118,6 +118,7 @@ public interface BuildLog {
 	 * 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);
 

diff --git a/...t/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/...t/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java
@@ -320,9 +320,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

diff --git a/...boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java b/...boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java
@@ -443,9 +443,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