Merge pull request #172 from coheigea/gmavenplus

Switch to gmavenplus and update groovy