spring upgrade builds and unit tests pass.