Upgraded groovy to 2.1.5