SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-06-26 11:38:57 +02:00
parent b1710ff74c a58461f1c0
commit e8142b4b43
12 changed files with 16 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

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

2
docs/src/main/asciidoc/verifier/introduction.adoc
View File

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

8
pom.xml
View File

@@ -91,7 +91,7 @@
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>4.9</version>
<version>5.0.3</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -111,7 +111,7 @@
<dependency>
<groupId>info.solidsoft.spock</groupId>
<artifactId>spock-global-unroll</artifactId>
<version>0.5.0</version>
<version>0.5.1</version>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
@@ -125,12 +125,12 @@
<dependency>
<groupId>io.specto</groupId>
<artifactId>hoverfly-junit</artifactId>
<version>0.1.8</version>
<version>0.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
<version>3.6</version>
</dependency>
<dependency>
<groupId>au.com.dius</groupId>

2
spring-cloud-contract-dependencies/pom.xml
View File

@@ -14,7 +14,7 @@
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
<properties>
<wiremock.version>2.5.1</wiremock.version>
<wiremock.version>2.6.0</wiremock.version>
<jsonassert.version>0.4.9</jsonassert.version>
<aether.version>1.0.2.v20150114</aether.version>
</properties>

2
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy
View File

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

314
spring-cloud-contract-stub-runner/src/test/resources/simulation.json
View File

@@ -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"
]
}
}
}
]
}
{"data":{"pairs":[],"globalActions":{"delays":[]}},"meta":{"schemaVersion":"v1","hoverflyVersion":"v0.9.0","timeExported":"2017-06-26T10:48:01+02:00"}}

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
View File

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

4
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockStubMappingSpec.groovy
View File

@@ -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)
}