Fix groovy and spock dependencies