Issue #840 - Refactor Maven to not use deprecated task