Move to maven 3