fix class cast exception
add excludes to avoid pulling in old groovy version
Merge remote-tracking branch 'origin/3.x'