Upgraded Groovy to version 2.x.x