diff --git a/README.adoc b/README.adoc index feb1167a76..a38a7f8277 100644 --- a/README.adoc +++ b/README.adoc @@ -520,7 +520,7 @@ In the logs we'll see something like this: [INFO] --- maven-jar-plugin:2.6:jar (default-jar) @ http-server --- [INFO] Building jar: /some/path/http-server/target/http-server-0.0.1-SNAPSHOT.jar [INFO] -[INFO] --- spring-boot-maven-plugin:1.5.4.BUILD-SNAPSHOT:repackage (default) @ http-server --- +[INFO] --- spring-boot-maven-plugin:1.5.5.BUILD-SNAPSHOT:repackage (default) @ http-server --- [INFO] [INFO] --- maven-install-plugin:2.5.2:install (default-install) @ http-server --- [INFO] Installing /some/path/http-server/target/http-server-0.0.1-SNAPSHOT.jar to /path/to/your/.m2/repository/com/example/http-server/0.0.1-SNAPSHOT/http-server-0.0.1-SNAPSHOT.jar diff --git a/docs/src/main/asciidoc/verifier/introduction.adoc b/docs/src/main/asciidoc/verifier/introduction.adoc index 1155c02ef4..ac09aa6d59 100644 --- a/docs/src/main/asciidoc/verifier/introduction.adoc +++ b/docs/src/main/asciidoc/verifier/introduction.adoc @@ -292,7 +292,7 @@ In the logs we'll see something like this: [INFO] --- maven-jar-plugin:2.6:jar (default-jar) @ http-server --- [INFO] Building jar: /some/path/http-server/target/http-server-0.0.1-SNAPSHOT.jar [INFO] -[INFO] --- spring-boot-maven-plugin:1.5.4.BUILD-SNAPSHOT:repackage (default) @ http-server --- +[INFO] --- spring-boot-maven-plugin:1.5.5.BUILD-SNAPSHOT:repackage (default) @ http-server --- [INFO] [INFO] --- maven-install-plugin:2.5.2:install (default-install) @ http-server --- [INFO] Installing /some/path/http-server/target/http-server-0.0.1-SNAPSHOT.jar to /path/to/your/.m2/repository/com/example/http-server/0.0.1-SNAPSHOT/http-server-0.0.1-SNAPSHOT.jar diff --git a/pom.xml b/pom.xml index db5ce885f0..270403661c 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ net.sf.jopt-simple jopt-simple - 4.9 + 5.0.3 cglib @@ -111,7 +111,7 @@ info.solidsoft.spock spock-global-unroll - 0.5.0 + 0.5.1 org.springframework.amqp @@ -125,12 +125,12 @@ io.specto hoverfly-junit - 0.1.8 + 0.2.2 org.apache.commons commons-lang3 - 3.4 + 3.6 au.com.dius diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index e1c273fdce..fdf73436ba 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -14,7 +14,7 @@ spring-cloud-contract-dependencies Spring Cloud Contract Dependencies - 2.5.1 + 2.6.0 0.4.9 1.0.2.v20150114 diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy index 3e3a262639..de1e3f8586 100644 --- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy +++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy @@ -11,7 +11,7 @@ import spock.util.environment.RestoreSystemProperties class AetherStubDownloaderSpec extends Specification { @Rule - HoverflyRule hoverflyRule = HoverflyRule.buildFromClassPathResource("simulation.json").build() + HoverflyRule hoverflyRule = HoverflyRule.inCaptureMode("simulation.json") def 'Should be able to download from a repository using username and password authentication'() { given: diff --git a/spring-cloud-contract-stub-runner/src/test/resources/simulation.json b/spring-cloud-contract-stub-runner/src/test/resources/simulation.json index 20d8c8239c..93942f7f56 100644 --- a/spring-cloud-contract-stub-runner/src/test/resources/simulation.json +++ b/spring-cloud-contract-stub-runner/src/test/resources/simulation.json @@ -1,313 +1 @@ -{ - "data": [ - { - "response": { - "status": 200, - "body": "\u003c?xml version=\"1.0\" encoding=\"UTF-8\"?\u003e\n\u003cmetadata\u003e\n \u003cgroupId\u003eio.test\u003c/groupId\u003e\n \u003cartifactId\u003etest-simulations-svc\u003c/artifactId\u003e\n \u003cversion\u003e1.0-SNAPSHOT\u003c/version\u003e\n \u003cversioning\u003e\n \u003csnapshot\u003e\n \u003cbuildNumber\u003e1\u003c/buildNumber\u003e\n \u003c/snapshot\u003e\n \u003clastUpdated\u003e20161102142105\u003c/lastUpdated\u003e\n \u003c/versioning\u003e\n\u003c/metadata\u003e\n", - "encodedBody": false, - "headers": { - "Accept-Ranges": [ - "bytes" - ], - "Cache-Control": [ - "no-store" - ], - "Connection": [ - "keep-alive" - ], - "Content-Disposition": [ - "attachment; filename=\"maven-metadata.xml\"; filename*=UTF-8''maven-metadata.xml" - ], - "Content-Length": [ - "320" - ], - "Content-Type": [ - "application/xml" - ], - "Date": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Etag": [ - "9a318b6f330aaf4b7088c3018e31dd4bb11b18f1" - ], - "Hoverfly": [ - "Was-Here" - ], - "Last-Modified": [ - "Wed, 02 Nov 2016 14:21:05 GMT" - ], - "Server": [ - "Artifactory/4.14.0" - ], - "X-Artifactory-Filename": [ - "maven-metadata.xml" - ], - "X-Artifactory-Id": [ - "aolprod1b-test" - ], - "X-Checksum-Md5": [ - "baa7a56ac80111c29099f9076e6a136f" - ], - "X-Checksum-Sha1": [ - "9a318b6f330aaf4b7088c3018e31dd4bb11b18f1" - ], - "X-Node": [ - "nginx-shared2b" - ] - } - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/maven-metadata.xml", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "", - "headers": { - "Authorization": [ - "Basic dXNlcm5hbWU6cGFzc3dvcmQK==" - ] - } - } - }, - { - "response": { - "status": 401 - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/maven-metadata.xml", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "" - } - }, - { - "response": { - "status": 401 - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/test-simulations-svc-1.0-SNAPSHOT-stubs.jar.sha1", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "" - } - }, - { - "response": { - "status": 401 - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/test-simulations-svc-1.0-SNAPSHOT-stubs.jar.md5", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "" - } - }, - { - "response": { - "status": 200, - "body": "9a318b6f330aaf4b7088c3018e31dd4bb11b18f1", - "encodedBody": false, - "headers": { - "Connection": [ - "keep-alive" - ], - "Content-Length": [ - "40" - ], - "Content-Type": [ - "application/x-checksum" - ], - "Date": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Hoverfly": [ - "Was-Here" - ], - "Last-Modified": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Server": [ - "Artifactory/4.14.0" - ], - "X-Artifactory-Id": [ - "aolprod1b-test" - ], - "X-Node": [ - "nginx-shared2b" - ] - } - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/maven-metadata.xml.sha1", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "", - "headers": { - "Accept-Encoding": [ - "gzip,deflate" - ], - "Authorization": [ - "Basic dXNlcm5hbWU6cGFzc3dvcmQK==" - ], - "Cache-Control": [ - "no-cache, no-store" - ], - "Connection": [ - "Keep-Alive" - ], - "Pragma": [ - "no-cache" - ], - "User-Agent": [ - "Aether" - ] - } - } - }, - { - "response": { - "status": 200, - "body": "UEsDBAoAAAgIAJxyYkkAAAAAAgAAAAAAAAAJAAAATUVUQS1JTkYvAwBQSwMECgAACAgAnHJiSbJ/Au4bAAAAGQAAABQAAABNRVRBLUlORi9NQU5JRkVTVC5NRvNNzMtMSy0u0Q1LLSrOzM+zUjDUM+Dl4uUCAFBLAwQKAAAICACccmJJAAAAAAIAAAAAAAAACgAAAGNvbnRyYWN0cy8DAFBLAwQKAAAICACccmJJkcxXfpgAAADnAAAALwAAAGNvbnRyYWN0cy9zaG91bGRCZUFibGVUb0NyZWF0ZVNpbXVsYXRpb24uZ3Jvb3Z5VY1BDsIgFET3nIIdbUxo9QpewIUe4Id+kRQE/4dqYnp30bRGZzdvJjMJzAgWpYnXTGAyCxHJak7krvZMEPAeadTGxzLotVRjNHq/ugAjyqeQVYS3gpwX91bAfImDVIfTUX1hIS8n8AWbOsklIDWEFh+N6tiF4iG7yjtIrpu2f0hvVNu2n6F5eeRUA/y55Ay5sNz1/dKbxQtQSwMECgAACAgAnHJiSQAAAAACAAAAAAAAAAkAAABtYXBwaW5ncy8DAFBLAwQKAAAICACccmJJT/HGJIsAAADBAAAALAAAAG1hcHBpbmdzL3Nob3VsZEJlQWJsZVRvQ3JlYXRlU2ltdWxhdGlvbi5qc29uVY07DsIwEET7nMJyC8ZOlI/gFCngAGtlIyzl613TRLk7dqCAcp7mzWyZEDIE10lxExLLyti+QdUAWFX2plC2rq3CCK9VZ9DmvTwnxeMakDhZW8xpxA8tMKOfjilNbgwDsJsn0rA4/cr/0OV0DEVxRH7On//2cZcR7t8LWmITfz6IgQMlUBiTitn+BlBLAQIUAwoAAAgIAJxyYkkAAAAAAgAAAAAAAAAJAAAAAAAAAAAAEADtQQAAAABNRVRBLUlORi9QSwECFAMKAAAICACccmJJsn8C7hsAAAAZAAAAFAAAAAAAAAAAAAAApIEpAAAATUVUQS1JTkYvTUFOSUZFU1QuTUZQSwECFAMKAAAICACccmJJAAAAAAIAAAAAAAAACgAAAAAAAAAAABAA/UF2AAAAY29udHJhY3RzL1BLAQIUAwoAAAgIAJxyYkmRzFd+mAAAAOcAAAAvAAAAAAAAAAAAAAC0gaAAAABjb250cmFjdHMvc2hvdWxkQmVBYmxlVG9DcmVhdGVTaW11bGF0aW9uLmdyb292eVBLAQIUAwoAAAgIAJxyYkkAAAAAAgAAAAAAAAAJAAAAAAAAAAAAEAD9QYUBAABtYXBwaW5ncy9QSwECFAMKAAAICACccmJJT/HGJIsAAADBAAAALAAAAAAAAAAAAAAAtIGuAQAAbWFwcGluZ3Mvc2hvdWxkQmVBYmxlVG9DcmVhdGVTaW11bGF0aW9uLmpzb25QSwUGAAAAAAYABgCfAQAAgwIAAAAA", - "encodedBody": true, - "headers": { - "Accept-Ranges": [ - "bytes" - ], - "Cache-Control": [ - "no-store" - ], - "Connection": [ - "keep-alive" - ], - "Content-Disposition": [ - "attachment; filename=\"test-simulations-svc-1.0-SNAPSHOT-stubs.jar\"; filename*=UTF-8''test-simulations-svc-1.0-SNAPSHOT-stubs.jar" - ], - "Content-Length": [ - "1080" - ], - "Content-Type": [ - "application/java-archive" - ], - "Date": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Etag": [ - "6c40475c58db6745b860e7b3f0ffa1c87faa83ce" - ], - "Hoverfly": [ - "Was-Here" - ], - "Last-Modified": [ - "Wed, 02 Nov 2016 14:21:06 GMT" - ], - "Server": [ - "Artifactory/4.14.0" - ], - "X-Artifactory-Filename": [ - "test-simulations-svc-1.0-SNAPSHOT-stubs.jar" - ], - "X-Artifactory-Id": [ - "aolprod1b-test" - ], - "X-Checksum-Md5": [ - "0b8c9e9880654871beaf1cf40cd07aaf" - ], - "X-Checksum-Sha1": [ - "6c40475c58db6745b860e7b3f0ffa1c87faa83ce" - ], - "X-Node": [ - "nginx-shared2b" - ] - } - }, - "request": { - "requestType": "template", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/test-simulations-svc-1.0-SNAPSHOT-stubs.jar", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "" - } - }, - { - "response": { - "status": 200, - "body": "6c40475c58db6745b860e7b3f0ffa1c87faa83ce", - "encodedBody": false, - "headers": { - "Connection": [ - "keep-alive" - ], - "Content-Length": [ - "40" - ], - "Content-Type": [ - "application/x-checksum" - ], - "Date": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Hoverfly": [ - "Was-Here" - ], - "Last-Modified": [ - "Tue, 08 Nov 2016 15:22:26 GMT" - ], - "Server": [ - "Artifactory/4.14.0" - ], - "X-Artifactory-Id": [ - "aolprod1b-test" - ], - "X-Node": [ - "nginx-shared2b" - ] - } - }, - "request": { - "requestType": "recording", - "path": "/test/libs-snapshot-local/io/test/test-simulations-svc/1.0-SNAPSHOT/test-simulations-svc-1.0-SNAPSHOT-stubs.jar.sha1", - "method": "GET", - "destination": "test.jfrog.io", - "scheme": "https", - "query": "", - "body": "", - "headers": { - "Accept-Encoding": [ - "gzip,deflate" - ], - "Authorization": [ - "Basic dXNlcm5hbWU6cGFzc3dvcmQK==" - ], - "Cache-Control": [ - "no-cache, no-store" - ], - "Connection": [ - "Keep-Alive" - ], - "Pragma": [ - "no-cache" - ], - "User-Agent": [ - "Aether" - ] - } - } - } - ] -} \ No newline at end of file +{"data":{"pairs":[],"globalActions":{"delays":[]}},"meta":{"schemaVersion":"v1","hoverflyVersion":"v0.9.0","timeExported":"2017-06-26T10:48:01+02:00"}} \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties index 7ea475e263..fac57fbf66 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.5.1 +wiremockVersion=2.6.0 jsonAssertVersion=0.4.8 verifierVersion=2.0.0.BUILD-SNAPSHOT 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 e57fea12e9..11bd14a756 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 @@ -91,7 +91,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.5.1") { + testCompile("com.github.tomakehurst:wiremock:2.6.0") { exclude group: 'org.eclipse.jetty' } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties index c2b2db88e6..b4bc730a18 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.5.1 +wiremockVersion=2.6.0 jsonAssertVersion=0.4.8 verifierVersion=2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties index 466b18e632..265532c26e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.5.1 +wiremockVersion=2.6.0 jsonAssertVersion=0.4.8 verifierVersion=2.0.0.BUILD-SNAPSHOT \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties index 7ea475e263..fac57fbf66 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -wiremockVersion=2.5.1 +wiremockVersion=2.6.0 jsonAssertVersion=0.4.8 verifierVersion=2.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy index 05c762461e..d71b28f138 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy @@ -47,12 +47,12 @@ class WireMockStubMappingSpec extends Specification { WireMockStubMapping.buildFrom(stub_2_1_7) } - def "should successfully parse a WireMock 2.5.1 stub"() { + def "should successfully parse a WireMock 2.6.0 stub"() { expect: WireMockStubMapping.buildFrom(stub_2_5_1) } - def "should successfully parse a WireMock 2.5.1 stub that contains transformers"() { + def "should successfully parse a WireMock 2.6.0 stub that contains transformers"() { expect: WireMockStubMapping.buildFrom(stub_2_5_1_with_transformer) }