Moved to maven build