Updated to Groovy 2.x, quickfix for GROOVY-6158