From a1f3eaa0af42ca359463f6bbc4f89f73ffd3b7c2 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 9 Jul 2016 15:35:23 +0100 Subject: [PATCH] Try to fix gradle build --- .../build.gradle | 13 ++++++++++--- .../gradle/release.gradle | 8 ++++---- .../plugin/ContractVerifierIntegrationSpec.groovy | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/spring-cloud-contract-verifier-gradle-plugin/build.gradle b/spring-cloud-contract-verifier-gradle-plugin/build.gradle index 95494749f4..d0f2abec1b 100644 --- a/spring-cloud-contract-verifier-gradle-plugin/build.gradle +++ b/spring-cloud-contract-verifier-gradle-plugin/build.gradle @@ -45,13 +45,20 @@ allprojects { dependencies { compile gradleApi() compile localGroovy() - compile "org.springframework.cloud.contract:spring-cloud-contract-verifier-core:${project.version}" - compile "org.springframework.cloud.contract:spring-cloud-contract-verifier-converters:${project.version}" - compile "org.springframework.cloud.contract:spring-cloud-contract-stub-runner:${project.version}" + compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-core:${project.version}") { + exclude(group: 'org.codehaus.groovy') + } + compile("org.springframework.cloud.contract:spring-cloud-contract-verifier-converters:${project.version}") { + exclude(group: 'org.codehaus.groovy') + } + compile("org.springframework.cloud.contract:spring-cloud-contract-stub-runner:${project.version}") { + exclude(group: 'org.codehaus.groovy') + } testCompile('org.spockframework:spock-core:1.0-groovy-2.4') { exclude(group: 'org.codehaus.groovy') } testCompile 'info.solidsoft.spock:spock-global-unroll:0.5.0' + testCompile gradleTestKit() } test { diff --git a/spring-cloud-contract-verifier-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-verifier-gradle-plugin/gradle/release.gradle index ae90a8c9d7..270eb5a03e 100644 --- a/spring-cloud-contract-verifier-gradle-plugin/gradle/release.gradle +++ b/spring-cloud-contract-verifier-gradle-plugin/gradle/release.gradle @@ -49,13 +49,13 @@ afterEvaluate { name "$project.name" packaging 'jar' description 'Consumer Driven Contract Verifier and Stub Runner' - url 'https://github.com/Codearte/accurest' + url 'https://github.com/spring-cloud/spring-cloud-contract' inceptionYear '2014' scm { - connection 'scm:git:git@github.com:Codearte/accurest.git' - developerConnection 'scm:git:git@github.com:Codearte/accurest.git' - url 'https://github.com/Codearte/accurest' + connection 'scm:git:git@github.com:spring-cloud/spring-cloud-contract.git' + developerConnection 'scm:git:git@github.com:spring-cloud/spring-cloud-contract.git' + url 'https://github.com/spring-cloud/spring-cloud-contract' } licenses { diff --git a/spring-cloud-contract-verifier-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy b/spring-cloud-contract-verifier-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy index 6e3ced3368..cb5f358900 100644 --- a/spring-cloud-contract-verifier-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy +++ b/spring-cloud-contract-verifier-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy @@ -49,9 +49,9 @@ abstract class ContractVerifierIntegrationSpec extends Specification { protected void setupForProject(String projectRoot) { copyResourcesToRoot(projectRoot) String gradlePluginSysProp = System.getProperty("contract-verifier-gradle-plugin-libs-dir") - String gradlePluginLibsDir = (gradlePluginSysProp ?: new File("build/").toString()).replace('\\', '\\\\') + String gradlePluginLibsDir = (gradlePluginSysProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\') String messagingLibDirProp = System.getProperty("messaging-libs-dir") - String messagingLibDir = (messagingLibDirProp ?: new File("build/").toString()).replace('\\', '\\\\') + String messagingLibDir = (messagingLibDirProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\') buildFile.write """ ext.messagingLibsDir = '$messagingLibDir'