PRD-4665: Groovy needs to go up to 1.8