Back onto Spring Data Snapshot

This change reverts an earlier, overly-agressive, change to get off of
the Spring Data snapshots.