Updating pom's to support a single major version of Spring