updated Spring Framework and Spring Data JPA Versions
merge conflicted