Spring 4.0.0 compatibility