Fix Groovy failing build and update dependencies within major versions

Fix Groovy failing build and update dependencies within major versions #1617