Update to Spring 4.0.0.RC2 and update code to match changes in spring