upgrade to Spring 4.x