Upgrade spring references