Amother attempt to fix groovy 22 build