More maven 3.1.1 changes