Make branch 1.5.x compatible to maven 3.1.x