Upgrade Spring application for round 10