Upgrade to Maven 3