Upgrade to latest spring framework