BATCH-2144 Gradle dependency cleanup

* Bring more in line with core Springframework