spring and thymeleaf upgrades