Upgrade Spring to 4.x