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 '2.7.x' into 3.0.x 

Closes gh-37517
This commit is contained in:
Scott Frederick 2023-09-21 11:56:48 -05:00
parent dc8e69cc8d bd855135b0
commit e5e04d9fbc
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-bootDistZipJarApp.gradle
View File

@ -37,6 +37,7 @@ application {
} }
bootBuildImage { bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = bootDistZip.archiveFile archiveFile = bootDistZip.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()] environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
} }

4
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-executableWarApp.gradle
View File

@ -32,3 +32,7 @@ bootWar {
) )
} }
} }
bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
}

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-nativeApp.gradle
View File

@ -34,5 +34,6 @@ bootJar {
} }
bootBuildImage { bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
environment = ['BP_NATIVE_IMAGE': 'true'] environment = ['BP_NATIVE_IMAGE': 'true']
} }

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainDistZipJarApp.gradle
View File

@ -37,6 +37,7 @@ application {
} }
bootBuildImage { bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = distZip.archiveFile archiveFile = distZip.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()] environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion()]
} }

1
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests-plainWarApp.gradle
View File

@ -30,6 +30,7 @@ war {
} }
bootBuildImage { bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
archiveFile = war.archiveFile archiveFile = war.archiveFile
environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*'] environment = ['BP_JVM_VERSION': project.targetCompatibility.getMajorVersion(), 'BP_TOMCAT_VERSION': '10.*']
} }

6
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/resources/org/springframework/boot/image/paketo/PaketoBuilderTests.gradle
View File

@ -29,4 +29,8 @@ bootJar {
'Implementation-Title': "Paketo Test" 'Implementation-Title': "Paketo Test"
) )
} }
} }
bootBuildImage {
builder = "paketobuildpacks/builder-jammy-base:latest"
}