Spring4 upgrade