Switched to groovy 2.2.1