Try to fix gradle build

This commit is contained in:
Dave Syer
2016-07-09 15:35:23 +01:00
parent dffc0e0b39
commit a1f3eaa0af
3 changed files with 16 additions and 9 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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'