From 81598b51f9be687026beeab9bfe06808aa25999a Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Mon, 26 Sep 2022 14:18:17 -0500 Subject: [PATCH] Use task outputs in distZip Paketo system tests Using the outputs from `distZip` and `bootDistZip` as input to the `bootBuildImage` task instead of indirectly using the output file path prevents Gradle warnings about implicit task dependencies. Fixes gh-32506 --- .../image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle | 2 +- .../image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle index b363aae0f8..0c76d495d7 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle @@ -37,5 +37,5 @@ application { } bootBuildImage { - archiveFile = new File("${buildDir}/distributions/${project.name}-boot.zip") + archiveFile = bootDistZip.archiveFile } \ No newline at end of file diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle index 261af47bf7..797ccb8829 100644 --- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle +++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle @@ -37,5 +37,5 @@ application { } bootBuildImage { - archiveFile = new File("${buildDir}/distributions/${project.name}.zip") + archiveFile = distZip.archiveFile } \ No newline at end of file