-
Notifications
You must be signed in to change notification settings - Fork 101
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
fix: Spring Boot 2.6 compatibility #944
Conversation
do we need to update https://github.com/vaadin/spring/blob/master/pom.xml#L47 to spring-boot 2.6.0? |
This PR should be compatible with Spring Boot 2.4+. Maybe we should still update the version at the same time |
This fix could go into V22, we probably shouldn't go to Spring Boot 2.6 for that at this point |
Let's do the version update in #940 |
The FQN defined in isSpringBootConfigured is probably faulty as well |
And there is an extra |
f7ed69e
to
3aa376c
Compare
Simplified |
@@ -22,6 +22,8 @@ | |||
import java.util.Optional; | |||
import java.util.stream.Collectors; | |||
|
|||
import org.springframework.beans.factory.NoSuchBeanDefinitionException; | |||
import org.springframework.boot.autoconfigure.web.WebProperties.Resources; |
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.
Is this class to be expected to work with plain spring or just spring boot?
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.
It is supposed to work with Spring. Seems like there are no proper tests for plain Spring projects in this repository
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 keep the untested code then and hope that it might work with plain Spring..
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.
I would like to have a more spring boot oriented implementation as well.. but I've seen multiple PRs in this repo in the past where explicitly a more complex route was taken to reduce the coupling with spring boot.. that's why I wanted to mention it
could you @Artur- help to fix the sonar issue, let's get this merged soon |
3aa376c
to
c9b1f01
Compare
I wouldn't care about Sonar issues at all, but Spring Boot 2.6.0 support for 22 would be cool ;-) |
^ for 14.6 as well 😀 |
For 14 series as well yeah 👍 |
SonarQube analysis reported 2 issues
|
Seems to work now, just waiting for a review |
Hi @Artur- , this commit cannot be picked to 19.0 by this bot, can you take a look and pick it manually?
Otherwise, please use 'git cherry-pick --skip' |
Seems like this is already in the 19.0 branch |
There was no |
Fixes #941