fix NPE with non matching mapper (#7329)
extend version dependencies (still compatible with ant 1.8 and jgit 3.0)