Repository: tapestry-5 Updated Branches: refs/heads/master 7293256e7 -> 4d1dcc26f
resolve Groovy version conflict between Geb and our default Spock version Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/4d1dcc26 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/4d1dcc26 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/4d1dcc26 Branch: refs/heads/master Commit: 4d1dcc26f2f5dd2c47a19a1e833eb7999bb35252 Parents: 7293256 Author: Jochen Kemnade <[email protected]> Authored: Thu Mar 5 12:48:23 2015 +0100 Committer: Jochen Kemnade <[email protected]> Committed: Thu Mar 5 12:48:23 2015 +0100 ---------------------------------------------------------------------- tapestry-webresources/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/4d1dcc26/tapestry-webresources/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle index 04228b3..902d42d 100644 --- a/tapestry-webresources/build.gradle +++ b/tapestry-webresources/build.gradle @@ -8,7 +8,8 @@ dependencies { testCompile project(":tapestry-runner") testCompile "org.gebish:geb-spock:${versions.geb}" - testCompile "org.spockframework:spock-core:${versions.spock}" + // Geb pulls in Groovy 2.3, so we need to select an appropriate Spock version + testCompile "org.spockframework:spock-core:1.0-groovy-2.3" testCompile "org.seleniumhq.selenium:selenium-java:${versions.selenium}", { exclude group: "org.eclipse.jetty"
