Upgraded to groovy 2.1.0