Upgrade to last groovy version