For now, upgraded to 2.2. Myself or someone can investigate why the changes to the antlr plugin causes our build to fail as we have time.