Update to Spring 3, fix dependencies