Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

Browse Source 
Fixes gh-24521 in 2.4.2
This commit is contained in:
Scott Frederick
2020-12-16 14:53:55 -06:00
parent 5fdb2ae2fd 0e5df2296e
commit dfcabe1665
6 changed files with 59 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle Normal file
View File

@@ -0,0 +1,11 @@
plugins {
id 'war'
id 'org.springframework.boot' version '{version}'
}
bootBuildImage {
jar = bootWar.archiveFile
}
sourceCompatibility = '1.8'
targetCompatibility = '1.8'

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

@@ -3,5 +3,9 @@ plugins {
id 'org.springframework.boot' version '{version}'
}
if (project.hasProperty('applyWarPlugin')) {
apply plugin: 'war'
}
sourceCompatibility = '1.8'
targetCompatibility = '1.8'