Update for changes in groovy plugin