Update to Spring 4.x