update groovy to 2.1; use spock 0.7