root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' 

Closes gh-42082
This commit is contained in:
Phillip Webb 2024-09-01 18:51:45 -07:00
parent 85682f8498 b29bc2dc2e
commit 7fc5c4bb6c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ public interface BuildLog {
* Log that a cache cleanup step was not completed successfully. * Log that a cache cleanup step was not completed successfully.
* @param cache the cache * @param cache the cache
* @param exception any exception that caused the failure * @param exception any exception that caused the failure
* @since 3.2.6
*/ */
void failedCleaningWorkDir(Cache cache, Exception exception); void failedCleaningWorkDir(Cache cache, Exception exception);

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

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

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

@ -464,9 +464,9 @@ class BuildImageTests extends AbstractArchiveIntegrationTests {
}); });
} }
private static void cleanupCache(Path buildCachePath) { private static void cleanupCache(Path cachePath) {
try { try {
FileSystemUtils.deleteRecursively(buildCachePath); FileSystemUtils.deleteRecursively(cachePath);
} }
catch (Exception ex) { catch (Exception ex) {
// ignore // ignore