From ac3b87bd06d25d4959f67712d53197c72199aed1 Mon Sep 17 00:00:00 2001 From: Mariusz Smykula Date: Wed, 30 Sep 2015 10:36:33 +0200 Subject: [PATCH] configuration update --- .../accurest/plugin/AccurestGradlePlugin.groovy | 2 +- .../functionalTest/bootSimple/build.gradle | 12 +++++------- .../functionalTest/bootSimple/gradle.properties | 2 +- .../sampleJerseyProject/build.gradle | 15 ++++++--------- .../functionalTest/sampleProject/build.gradle | 8 +++----- build.gradle | 9 ++++----- gradle.properties | 4 +++- 7 files changed, 23 insertions(+), 29 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 8a6b55ac23..efd3f76e92 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.2-beta") + project.dependencies.add("testCompile", "com.github.tomakehurst:wiremock:2.0.4-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 52e2415869..e392e694c3 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -34,19 +34,17 @@ repositories { dependencies { compile "org.springframework:spring-web:$springVersion" compile "org.springframework:spring-context-support:$springVersion" - compile "org.codehaus.groovy:groovy-all:2.4.1" + compile "org.codehaus.groovy:groovy-all:2.4.4" 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:1.2.0' + compile 'com.jayway.jsonpath:json-path-assert:2.0.0' - testCompile('com.github.tomakehurst:wiremock:1.53') { - exclude group: 'org.mortbay.jetty', module: 'servlet-api' - } - testCompile "org.spockframework:spock-spring:0.7-groovy-2.0" + testCompile "com.github.tomakehurst:wiremock:2.0.4-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.0.1" //provided + 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/bootSimple/gradle.properties b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index 71fcc0538e..c484dce638 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -1,4 +1,4 @@ groupId=com.ofg jacksonMapper=1.9.13 restAssuredVersion=2.4.0 -springVersion=4.1.4.RELEASE \ No newline at end of file +springVersion=4.1.7.RELEASE \ No newline at end of file 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 0ae605c532..ee3e5ea354 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -9,8 +9,8 @@ buildscript { } ext { - spockVersion = '0.7-groovy-2.0' restAssuredVersion = '2.4.0' + spockVersion = '1.0-groovy-2.4' accurestStubsBaseDirectory = 'src/test/resources/stubs' } @@ -18,19 +18,16 @@ ext { subprojects { apply plugin: 'groovy' - repositories { mavenCentral() mavenLocal() } dependencies { - testCompile "org.codehaus.groovy:groovy-all:2.3.7" + testCompile 'org.codehaus.groovy:groovy-all:2.4.4' testCompile "org.spockframework:spock-core:$spockVersion" - testCompile("junit:junit:4.12") - testCompile('com.github.tomakehurst:wiremock:1.52') { - exclude group: 'org.mortbay.jetty', module: 'servlet-api' - } + testCompile 'junit:junit:4.12' + testCompile 'com.github.tomakehurst:wiremock:2.0.4-beta' } } @@ -59,10 +56,10 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') 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.5.RELEASE') { + 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.5.RELEASE' + compile 'org.springframework.boot:spring-boot-starter-jetty:1.2.6.RELEASE' testRuntime "org.spockframework:spock-spring:$spockVersion" 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 aa4e17339c..7a88858a51 100644 --- a/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -9,8 +9,8 @@ buildscript { } ext { - spockVersion = '0.7-groovy-2.0' restAssuredVersion = '2.4.0' + spockVersion = '1.0-groovy-2.4' accurestStubsBaseDirectory = 'src/test/resources/stubs' } @@ -24,12 +24,10 @@ subprojects { } dependencies { - testCompile "org.codehaus.groovy:groovy-all:2.3.7" + testCompile "org.codehaus.groovy:groovy-all:2.4.4" testCompile "org.spockframework:spock-core:$spockVersion" testCompile("junit:junit:4.12") - testCompile('com.github.tomakehurst:wiremock:1.52') { - exclude group: 'org.mortbay.jetty', module: 'servlet-api' - } + testCompile "com.github.tomakehurst:wiremock:2.0.4-beta" } } diff --git a/build.gradle b/build.gradle index fda2787073..42d265f044 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ scmVersion { releaseCommitMessage { version, position -> "Release version: ${version}\n\n[ci skip]" } hooks { pre "fileUpdate", [file : "README.md", - pattern : { v, p -> /'io\.codearte\.accurest:accurest-gradle-plugin:.*'/ }, - replacement: { v, p -> "'io.codearte.accurest:accurest-gradle-plugin:$v'" }] + pattern : { v, p -> /'io\.codearte\.accurest:accurest-gradle-plugin:.*'/ }, + replacement: { v, p -> "'io.codearte.accurest:accurest-gradle-plugin:$v'" }] } } @@ -71,7 +71,7 @@ project(':accurest-core') { compile 'com.google.code.gson:gson:2.3.1' compile 'com.fasterxml.jackson.core:jackson-databind:2.4.5' compile 'asm:asm:3.3.1' - compile 'com.github.tomakehurst:wiremock:2.0.4-beta' + compile "com.github.tomakehurst:wiremock:$wiremockVersion" testCompile 'cglib:cglib-nodep:2.2' testCompile 'org.objenesis:objenesis:2.1' testCompile project(':accurest-testing-utils') @@ -93,7 +93,7 @@ project(':accurest-converters') { compile 'org.apache.commons:commons-lang3:[3.0,)' compile 'commons-io:commons-io:[2.0,)' compile 'dk.brics.automaton:automaton:1.11-8' // needed for Xeger - testCompile 'com.github.tomakehurst:wiremock:2.0.2-beta' + testCompile "com.github.tomakehurst:wiremock:$wiremockVersion" testCompile 'org.hamcrest:hamcrest-all:1.3' } } @@ -103,7 +103,6 @@ project(':accurest-gradle-plugin') { compile project(':accurest-core') compile project(':accurest-converters') compile gradleApi() - testCompile('com.netflix.nebula:nebula-test:2.2.1') { exclude(group: 'org.spockframework') } diff --git a/gradle.properties b/gradle.properties index fe3cdf2fd8..8ab8e8bf7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ nexusUsername = -nexusPassword = \ No newline at end of file +nexusPassword = + +wiremockVersion = 2.0.4-beta