From bd855135b0ea863a8849dd1ebd40955a31a5a12b Mon Sep 17 00:00:00 2001
From: Scott Frederick <sfrederick@vmware.com>
Date: Thu, 21 Sep 2023 11:56:35 -0500
Subject: [PATCH] Use Paketo Jammy builder in Paketo system tests

Closes gh-37516
---
 .../paketo/PaketoBuilderTests-bootDistZipJarApp.gradle      | 1 +
 .../image/paketo/PaketoBuilderTests-executableWarApp.gradle | 4 ++++
 .../paketo/PaketoBuilderTests-plainDistZipJarApp.gradle     | 1 +
 .../boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle | 1 +
 .../boot/image/paketo/PaketoBuilderTests.gradle             | 6 +++++-
 5 files changed, 12 insertions(+), 1 deletion(-)

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 0c76d495d7..76f114208d 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,6 @@ application {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	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-executableWarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle
index 291f22d1a0..7e31c33f9c 100644
--- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle
+++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle
@@ -32,3 +32,7 @@ bootWar {
 		)
 	}
 }
+
+bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
+}
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 797ccb8829..6ad47dbf01 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,6 @@ application {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	archiveFile = distZip.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-plainWarApp.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
index 566218f11c..570c490a64 100644
--- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
+++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
@@ -30,5 +30,6 @@ war {
 }
 
 bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
 	archiveFile = war.archiveFile
 }
diff --git a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle
index 71fe32355b..8f0b7daf86 100644
--- a/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle
+++ b/spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle
@@ -29,4 +29,8 @@ bootJar {
 				'Implementation-Title': "Paketo Test"
 		)
 	}
-}
\ No newline at end of file
+}
+
+bootBuildImage {
+	builder = "paketobuildpacks/builder-jammy-base:latest"
+}