Fix the build after the upgrade to Maven 3