updated spring and spring data versions; refactored to clean some deprecated methods