-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Use bootWar instead of war for Spring Boot war projects #1787
Conversation
15cb700
to
4d1bd2b
Compare
jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java
Show resolved
Hide resolved
jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java
Outdated
Show resolved
Hide resolved
jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TaskCommon.java
Show resolved
Hide resolved
There was a problem hiding this 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' |
There was a problem hiding this comment.
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)
There was a problem hiding this comment.
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.
I've resolved the merge conflicts and added the comment. |
There was a problem hiding this 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!
fixes #1786