Ben: upgrade to latest groovy