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

Don't wrongly assume Spring Boot isn't configured when empty <configuration> #2693

Merged
merged 2 commits into from
Aug 11, 2020

Conversation

chanseokoh
Copy link
Member

@chanseokoh chanseokoh commented Aug 11, 2020

Fixes #2692.

Reverts the fix of #2688, which only avoided NPE but wrongly assumed Spring Boot isn't configured by returning Optional.empty(). Instead, this PR returns an empty Xpp3Dom to signal that Spring Boot is configured.

Note that we do have a Spring Boot integration test for checking if we accidentally containerize a fat JAR. However, as mentioned here, this doesn't seem reproducible with a default setup. To hit both #2687 and #2692, it may be a multi-module Spring Boot setup (although I can't conclusively confirm this).

@chanseokoh chanseokoh requested a review from a team August 11, 2020 14:03
Copy link
Member

@loosebazooka loosebazooka left a comment

Choose a reason for hiding this comment

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

Ah interesting.

@chanseokoh chanseokoh merged commit 402efa6 into master Aug 11, 2020
@chanseokoh chanseokoh deleted the i2692-fix-spring-boot-jar branch August 11, 2020 14:25
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.

Incorrect application jar in /app/classpath/ (packaged mode)
3 participants