Upgrading to latest spring data and spring releases