Upgrading to run on spring 3.2.2