Merge branch '2.7.x'

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle

@@ -3,13 +3,10 @@ plugins {
 	id 'org.springframework.boot' version '{version}'
 }
 
-bootBuildImage {
-	jar = bootWar.archiveFile
-}
-
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 bootBuildImage {
 	builder = "projects.registry.vmware.com/springboot/spring-boot-cnb-builder:0.0.1"
+	archiveFile = bootWar.archiveFile
 }