Fix builds, revert springboot to 2.5.x