Fix Groovy 2.2 / 2.1 packaging issue