Upgraded Spring and Groovy