Migrate to Spring Boot.
Merge