Moving to Spring 4 based configuration