mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-37517
This commit is contained in:
commit
e5e04d9fbc
@ -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()]
|
||||||
}
|
}
|
@ -32,3 +32,7 @@ bootWar {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bootBuildImage {
|
||||||
|
builder = "paketobuildpacks/builder-jammy-base:latest"
|
||||||
|
}
|
||||||
|
@ -34,5 +34,6 @@ bootJar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bootBuildImage {
|
bootBuildImage {
|
||||||
|
builder = "paketobuildpacks/builder-jammy-base:latest"
|
||||||
environment = ['BP_NATIVE_IMAGE': 'true']
|
environment = ['BP_NATIVE_IMAGE': 'true']
|
||||||
}
|
}
|
||||||
|
@ -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()]
|
||||||
}
|
}
|
@ -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.*']
|
||||||
}
|
}
|
||||||
|
@ -29,4 +29,8 @@ bootJar {
|
|||||||
'Implementation-Title': "Paketo Test"
|
'Implementation-Title': "Paketo Test"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bootBuildImage {
|
||||||
|
builder = "paketobuildpacks/builder-jammy-base:latest"
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user