adapt upstream changes
update groovy and compiler version
update scala version