Update for Maven 3.1.X