upgrading from Spring 3.x to 4.x