Upgrade Spring & Groovy versions to latest