Upgrade groovy, add ant classes