Upgrade to maven 3 from maven 2