From d75b1cc44931f74be45a95c4d71c7428c0dbabc5 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 31 Aug 2024 11:30:18 +0900 Subject: [PATCH] Polish gh-40760 --- .../boot/buildpack/platform/build/BuildLog.java | 1 + .../gradle/tasks/bundling/BootBuildImageIntegrationTests.java | 4 ++-- .../java/org/springframework/boot/maven/BuildImageTests.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java index 43631983ce84..633886f55f5c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildLog.java +++ b/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 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); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java index 3c84395f8f34..a8d01cf1865c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests.java +++ b/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 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java index e049c53b61d9..ec9d5037f673 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/dockerTest/java/org/springframework/boot/maven/BuildImageTests.java +++ b/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