Upgrade to latest Spring