From 0759cb2d4a285e53cdd928d75139e2eca039590b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 30 Aug 2017 14:21:28 +0200 Subject: [PATCH] Fixing gradle project versions --- .../src/test/resources/functionalTest/bootSimple/build.gradle | 4 ++-- .../resources/functionalTest/sampleJerseyProject/build.gradle | 4 ++-- .../test/resources/functionalTest/sampleProject/build.gradle | 4 ++-- .../resources/functionalTest/scenarioProject/build.gradle | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle index ccdc5b2fa0..2a33e16b91 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -29,8 +29,8 @@ repositories { } dependencies { - compile "org.springframework:spring-web:5.0.0.RC2" - compile "org.springframework:spring-context-support:5.0.0.RC2" + compile "org.springframework:spring-web" + compile "org.springframework:spring-context-support" compile "org.codehaus.groovy:groovy-all:2.5.0-beta-1" compile 'com.jayway.jsonpath:json-path-assert:2.2.0' diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index ad320f8280..286db6a52c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -23,7 +23,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M3") } } @@ -90,7 +90,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') testCompile "org.mockito:mockito-core" testCompile "org.springframework:spring-test" testCompile "org.springframework.boot:spring-boot-test" - testCompile("com.github.tomakehurst:wiremock:2.7.1") { + testCompile("com.github.tomakehurst:wiremock:${wiremockVersion}") { exclude group: 'org.eclipse.jetty' } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle index 94ddc41b74..1a63d36f7e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -23,7 +23,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M3") } } @@ -115,7 +115,7 @@ configure(project(':fraudDetectionService')) { configure(project(':loanApplicationService')) { - task copyCollaboratorStubs(type: com.sun.org.apache.xalan.internal.xsltc.compiler.Copy) { + task copyCollaboratorStubs(type: Copy) { File fraudBuildDir = project(':fraudDetectionService').buildDir from(new File(fraudBuildDir, "/production/${project(':fraudDetectionService').name}-stubs/")) into "src/test/resources/" diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle index 97fddcb286..6921a6f2ab 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle @@ -23,7 +23,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.BUILD-SNAPSHOT") + classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M3") } }