Switched to Maven