From 10835c1fcbe116c03301183892cf5f1bde70c526 Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Tue, 6 Oct 2015 13:06:11 +0200 Subject: [PATCH] wiremock update to 2.0.5-beta and cleanup --- .../plugin/AccurestGradlePlugin.groovy | 2 +- .../functionalTest/bootSimple/build.gradle | 7 ++---- .../sampleJerseyProject/build.gradle | 22 ++++++++++--------- .../functionalTest/sampleProject/build.gradle | 9 ++++---- gradle.properties | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy index efd3f76e92..11a86d33c9 100644 --- a/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy +++ b/accurest-gradle-plugin/src/main/groovy/io/codearte/accurest/plugin/AccurestGradlePlugin.groovy @@ -30,7 +30,7 @@ class AccurestGradlePlugin implements Plugin { createGenerateTestsTask(extension) createAndConfigureGenerateWireMockClientStubsFromDslTask(extension) deprecatedCreateAndConfigureGenerateWiremockClientStubsFromDslTask() - project.dependencies.add("testCompile", "com.github.tomakehurst:wiremock:2.0.4-beta") + project.dependencies.add("testCompile", "com.github.tomakehurst:wiremock:2.0.5-beta") project.afterEvaluate { def hasIdea = project.plugins.findPlugin(IDEA_PLUGIN_CLASS) diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle index e392e694c3..e7565e3efe 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -34,17 +34,14 @@ repositories { dependencies { compile "org.springframework:spring-web:$springVersion" compile "org.springframework:spring-context-support:$springVersion" - compile "org.codehaus.groovy:groovy-all:2.4.4" + compile "org.codehaus.groovy:groovy-all:2.4.5" compile 'com.fasterxml.jackson.core:jackson-databind:2.4.4' - compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonMapper" - compile "org.codehaus.jackson:jackson-core-asl:$jacksonMapper" compile 'com.jayway.jsonpath:json-path-assert:2.0.0' - testCompile "com.github.tomakehurst:wiremock:2.0.4-beta" + testCompile "com.github.tomakehurst:wiremock:2.0.5-beta" testCompile "org.spockframework:spock-spring:1.0-groovy-2.4" testCompile "com.jayway.restassured:rest-assured:$restAssuredVersion" testCompile "com.jayway.restassured:spring-mock-mvc:$restAssuredVersion" - testCompile 'javax.servlet:javax.servlet-api:3.1.0' testCompile "ch.qos.logback:logback-classic:1.1.2" } diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index ee3e5ea354..f33b17b5a6 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -4,13 +4,14 @@ buildscript { mavenCentral() } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.2.1.RELEASE" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.2.6.RELEASE" } } ext { - restAssuredVersion = '2.4.0' + restAssuredVersion = '2.5.0' spockVersion = '1.0-groovy-2.4' + wiremockVersion = '2.0.5-beta' accurestStubsBaseDirectory = 'src/test/resources/stubs' } @@ -24,10 +25,10 @@ subprojects { } dependencies { - testCompile 'org.codehaus.groovy:groovy-all:2.4.4' + testCompile 'org.codehaus.groovy:groovy-all:2.4.5' testCompile "org.spockframework:spock-core:$spockVersion" testCompile 'junit:junit:4.12' - testCompile 'com.github.tomakehurst:wiremock:2.0.4-beta' + testCompile "com.github.tomakehurst:wiremock:$wiremockVersion" } } @@ -53,18 +54,19 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') version = '0.0.1' } + configurations { + compile.exclude module: "spring-boot-starter-tomcat" + } + dependencies { - compile "javax.ws.rs:javax.ws.rs-api:2.0.1" compile 'org.glassfish.jersey.containers:jersey-container-jetty-http:2.15' - compile('org.springframework.boot:spring-boot-starter-jersey:1.2.6.RELEASE') { - exclude module: "spring-boot-starter-tomcat" - } - compile 'org.springframework.boot:spring-boot-starter-jetty:1.2.6.RELEASE' + compile 'org.springframework.boot:spring-boot-starter-jersey' + compile 'org.springframework.boot:spring-boot-starter-jetty' testRuntime "org.spockframework:spock-spring:$spockVersion" compile 'org.glassfish.jersey.connectors:jersey-apache-connector:2.15' - testCompile 'org.springframework:spring-test:4.1.7.RELEASE' + testCompile 'org.springframework:spring-test' } task cleanup(type: Delete) { diff --git a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle index 7a88858a51..25ca064fc4 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -4,13 +4,14 @@ buildscript { mavenLocal() } dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.2.1.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:1.2.6.RELEASE") } } ext { - restAssuredVersion = '2.4.0' + restAssuredVersion = '2.5.0' spockVersion = '1.0-groovy-2.4' + wiremockVersion = '2.0.5-beta' accurestStubsBaseDirectory = 'src/test/resources/stubs' } @@ -24,10 +25,10 @@ subprojects { } dependencies { - testCompile "org.codehaus.groovy:groovy-all:2.4.4" + testCompile "org.codehaus.groovy:groovy-all:2.4.5" testCompile "org.spockframework:spock-core:$spockVersion" testCompile("junit:junit:4.12") - testCompile "com.github.tomakehurst:wiremock:2.0.4-beta" + testCompile "com.github.tomakehurst:wiremock:$wiremockVersion" } } diff --git a/gradle.properties b/gradle.properties index 8ab8e8bf7b..27a71580f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ nexusUsername = nexusPassword = -wiremockVersion = 2.0.4-beta +wiremockVersion = 2.0.5-beta