Update project to use Spring 4