fix compilation errors after upgrading to spring 4.0.0.RC1