Fixed deprecation warnings from Spring 3.2