Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fail with Gradle bootBuildImage and war packaging
Prior to this commit, running the bootBuildImage Gradle task on a project configured for war packaging would result in a jar file being built and used in the image instead of the war file. With this commit an error will be thrown from the plugin in this case. Fixes gh-24521
- Loading branch information
1 parent
2930053
commit 0e5df22
Showing
6 changed files
with
61 additions
and
1 deletion.
There are no files selected for viewing
4 changes: 3 additions & 1 deletion
4
...boot-tools/spring-boot-gradle-plugin/src/docs/asciidoc/packaging-oci-image.adoc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...ling/BootBuildImageIntegrationTests-buildsImageWithWarPackagingAndJarConfiguration.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
plugins { | ||
id 'war' | ||
id 'org.springframework.boot' version '{version}' | ||
} | ||
|
||
bootBuildImage { | ||
jar = bootWar.archiveFile | ||
} | ||
|
||
sourceCompatibility = '1.8' | ||
targetCompatibility = '1.8' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters