Upgrade to spring 3.2