Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use bootWar instead of war for Spring Boot war projects #1787

Merged
merged 5 commits into from
Jun 20, 2019

Conversation

larsgrefer
Copy link
Contributor

fixes #1786

Copy link
Member

@chanseokoh chanseokoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you have to resolve merge conflicts since I merged #1788.

@@ -70,6 +70,7 @@ dependencies {
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.23.4'
testCompile 'org.slf4j:slf4j-api:1.7.25'
testCompile 'org.springframework.boot:spring-boot-gradle-plugin:2.1.6.RELEASE'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a comment

// only for testing a concrete Spring Boot example in a test (not for test infrastructure)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have write access to this branch of my fork of jib. So you can do such small changes directly.

@larsgrefer
Copy link
Contributor Author

I've resolved the merge conflicts and added the comment.

Copy link
Member

@chanseokoh chanseokoh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is awesome. Thank you very much for adding support for Spring Boot WAR!

@chanseokoh chanseokoh merged commit 9559967 into GoogleContainerTools:master Jun 20, 2019
@larsgrefer larsgrefer deleted the feature/bootWar branch June 20, 2019 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

jibs war support doesn't play well with the spring boot gradle plugin
5 participants