diff --git a/README.adoc b/README.adoc index 8712dd235d..00bf411c4a 100644 --- a/README.adoc +++ b/README.adoc @@ -154,11 +154,7 @@ shown in the following example: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-verifier - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=verifier_test_dependencies,indent=0] ---- The following listing shows how to add the plugin, which should go in the build/plugins @@ -203,11 +199,7 @@ following example: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-stub-runner - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/pom.xml[tags=stub_runner,indent=0] ---- You can get the Producer-side stubs installed in your Maven repository in either of two @@ -341,33 +333,14 @@ The following example shows a Camel messaging contract expressed in Groovy DSL: [source,groovy] ---- - def contractDsl = Contract.make { - label 'some_label' - input { - messageFrom('jms:delete') - messageBody([ - bookName: 'foo' - ]) - messageHeaders { - header('sample', 'header') - } - assertThat('bookWasDeleted()') - } - } +Unresolved directive in verifier_introduction.adoc - include::{verifier_core_path}/src/test/groovy/org/springframework/cloud/contract/verifier/builder/MessagingMethodBodyBuilderSpec.groovy[tags=trigger_no_output_dsl] ---- The following example shows the same contract expressed in YAML: [source,yml,indent=0] ---- -label: some_label -input: - messageFrom: jms:delete - messageBody: - bookName: 'foo' - messageHeaders: - sample: header - assertThat: bookWasDeleted() +Unresolved directive in verifier_introduction.adoc - include::{verifier_core_path}/src/test/resources/yml/contract_message_scenario3.yml[indent=0] ---- Then you can add Spring Cloud Contract Verifier dependency and plugin to your build file, @@ -375,11 +348,7 @@ as shown in the following example: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-verifier - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=verifier_test_dependencies,indent=0] ---- The following listing shows how to add the plugin, which should go in the build/plugins @@ -534,11 +503,7 @@ To get started, add the dependency to `Spring Cloud Contract Stub Runner`: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-stub-runner - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/pom.xml[tags=stub_runner,indent=0] ---- You can get the Producer-side stubs installed in your Maven repository in either of two @@ -608,136 +573,13 @@ the PUT method. .Groovy DSL [source,groovy,indent=0] ---- -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package contracts - -org.springframework.cloud.contract.spec.Contract.make { - request { // (1) - method 'PUT' // (2) - url '/fraudcheck' // (3) - body([ // (4) - "client.id": $(regex('[0-9]{10}')), - loanAmount : 99999 - ]) - headers { // (5) - contentType('application/json') - } - } - response { // (6) - status OK() // (7) - body([ // (8) - fraudCheckStatus : "FRAUD", - "rejection.reason": "Amount too high" - ]) - headers { // (9) - contentType('application/json') - } - } -} - -/* -From the Consumer perspective, when shooting a request in the integration test: - -(1) - If the consumer sends a request -(2) - With the "PUT" method -(3) - to the URL "/fraudcheck" -(4) - with the JSON body that - * has a field `client.id` that matches a regular expression `[0-9]{10}` - * has a field `loanAmount` that is equal to `99999` -(5) - with header `Content-Type` equal to `application/json` -(6) - then the response will be sent with -(7) - status equal `200` -(8) - and JSON body equal to - { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -(9) - with header `Content-Type` equal to `application/json` - -From the Producer perspective, in the autogenerated producer-side test: - -(1) - A request will be sent to the producer -(2) - With the "PUT" method -(3) - to the URL "/fraudcheck" -(4) - with the JSON body that - * has a field `client.id` that will have a generated value that matches a regular expression `[0-9]{10}` - * has a field `loanAmount` that is equal to `99999` -(5) - with header `Content-Type` equal to `application/json` -(6) - then the test will assert if the response has been sent with -(7) - status equal `200` -(8) - and JSON body equal to - { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -(9) - with header `Content-Type` matching `application/json.*` - */ +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.groovy[] ---- .YAML [source,yml,indent=0] ---- -request: # (1) - method: PUT # (2) - url: /fraudcheck # (3) - body: # (4) - "client.id": 1234567890 - loanAmount: 99999 - headers: # (5) - Content-Type: application/json - matchers: - body: - - path: $.['client.id'] # (6) - type: by_regex - value: "[0-9]{10}" -response: # (7) - status: 200 # (8) - body: # (9) - fraudCheckStatus: "FRAUD" - "rejection.reason": "Amount too high" - headers: # (10) - Content-Type: application/json;charset=UTF-8 - - -#From the Consumer perspective, when shooting a request in the integration test: -# -#(1) - If the consumer sends a request -#(2) - With the "PUT" method -#(3) - to the URL "/fraudcheck" -#(4) - with the JSON body that -# * has a field `client.id` -# * has a field `loanAmount` that is equal to `99999` -#(5) - with header `Content-Type` equal to `application/json` -#(6) - and a `client.id` json entry matches the regular expression `[0-9]{10}` -#(7) - then the response will be sent with -#(8) - status equal `200` -#(9) - and JSON body equal to -# { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -#(10) - with header `Content-Type` equal to `application/json` -# -#From the Producer perspective, in the autogenerated producer-side test: -# -#(1) - A request will be sent to the producer -#(2) - With the "PUT" method -#(3) - to the URL "/fraudcheck" -#(4) - with the JSON body that -# * has a field `client.id` `1234567890` -# * has a field `loanAmount` that is equal to `99999` -#(5) - with header `Content-Type` equal to `application/json` -#(7) - then the test will assert if the response has been sent with -#(8) - status equal `200` -#(9) - and JSON body equal to -# { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -#(10) - with header `Content-Type` equal to `application/json;charset=UTF-8` +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/yml/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.yml[] ---- ==== Client Side @@ -750,21 +592,14 @@ At some point in time, you need to send a request to the Fraud Detection service [source,groovy,indent=0] ---- -ResponseEntity response = restTemplate.exchange( - "http://localhost:" + port + "/fraudcheck", HttpMethod.PUT, - new HttpEntity<>(request, httpHeaders), FraudServiceResponse.class); +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/src/main/java/com/example/loan/LoanApplicationService.java[tags=client_call_server,indent=0] ---- Annotate your test class with `@AutoConfigureStubRunner`. In the annotation provide the group id and artifact id for the Stub Runner to download stubs of your collaborators. [source,groovy,indent=0] ---- -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.NONE) -@AutoConfigureStubRunner(ids = { - "com.example:http-server-dsl:+:stubs:6565" }, stubsMode = StubRunnerProperties.StubsMode.LOCAL) -public class LoanApplicationServiceTests { - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java[tags=autoconfigure_stubrunner,indent=0] ---- After that, during the tests, Spring Cloud Contract automatically finds the stubs @@ -836,70 +671,13 @@ following section to your build: [source,xml,indent=0,subs="verbatim,attributes",role="primary"] .Maven ---- - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=repos,indent=0] ---- [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"] .Gradle ---- -repositories { - mavenCentral() - mavenLocal() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } -} +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/build.gradle[tags=deps_repos,indent=0] ---- ==== Consumer side (Loan Issuance) @@ -923,18 +701,7 @@ As a developer of the Loan Issuance service (a consumer of the Fraud Detection s [source,groovy,indent=0] ---- -@Test -public void shouldBeRejectedDueToAbnormalLoanAmount() { - // given: - LoanApplication application = new LoanApplication(new Client("1234567890"), - 99999); - // when: - LoanApplicationResult loanApplication = service.loanApplication(application); - // then: - assertThat(loanApplication.getLoanApplicationStatus()) - .isEqualTo(LoanApplicationStatus.LOAN_APPLICATION_REJECTED); - assertThat(loanApplication.getRejectionReason()).isEqualTo("Amount too high"); -} +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java[tags=client_tdd,indent=0] ---- Assume that you have written a test of your new feature. If a loan application for a big @@ -948,9 +715,7 @@ client wants to borrow. You want to send it to the `/fraudcheck` url via the `PU [source,groovy,indent=0] ---- -ResponseEntity response = restTemplate.exchange( - "http://localhost:" + port + "/fraudcheck", HttpMethod.PUT, - new HttpEntity<>(request, httpHeaders), FraudServiceResponse.class); +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/src/main/java/com/example/loan/LoanApplicationService.java[tags=client_call_server,indent=0] ---- For simplicity, the port of the Fraud Detection service is set to `8080`, and the @@ -980,136 +745,13 @@ is important because the producer's test base class name references that folder. .Groovy DSL [source,groovy,indent=0] ---- -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package contracts - -org.springframework.cloud.contract.spec.Contract.make { - request { // (1) - method 'PUT' // (2) - url '/fraudcheck' // (3) - body([ // (4) - "client.id": $(regex('[0-9]{10}')), - loanAmount : 99999 - ]) - headers { // (5) - contentType('application/json') - } - } - response { // (6) - status OK() // (7) - body([ // (8) - fraudCheckStatus : "FRAUD", - "rejection.reason": "Amount too high" - ]) - headers { // (9) - contentType('application/json') - } - } -} - -/* -From the Consumer perspective, when shooting a request in the integration test: - -(1) - If the consumer sends a request -(2) - With the "PUT" method -(3) - to the URL "/fraudcheck" -(4) - with the JSON body that - * has a field `client.id` that matches a regular expression `[0-9]{10}` - * has a field `loanAmount` that is equal to `99999` -(5) - with header `Content-Type` equal to `application/json` -(6) - then the response will be sent with -(7) - status equal `200` -(8) - and JSON body equal to - { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -(9) - with header `Content-Type` equal to `application/json` - -From the Producer perspective, in the autogenerated producer-side test: - -(1) - A request will be sent to the producer -(2) - With the "PUT" method -(3) - to the URL "/fraudcheck" -(4) - with the JSON body that - * has a field `client.id` that will have a generated value that matches a regular expression `[0-9]{10}` - * has a field `loanAmount` that is equal to `99999` -(5) - with header `Content-Type` equal to `application/json` -(6) - then the test will assert if the response has been sent with -(7) - status equal `200` -(8) - and JSON body equal to - { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -(9) - with header `Content-Type` matching `application/json.*` - */ +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.groovy[] ---- .YAML [source,yml,indent=0] ---- -request: # (1) - method: PUT # (2) - url: /fraudcheck # (3) - body: # (4) - "client.id": 1234567890 - loanAmount: 99999 - headers: # (5) - Content-Type: application/json - matchers: - body: - - path: $.['client.id'] # (6) - type: by_regex - value: "[0-9]{10}" -response: # (7) - status: 200 # (8) - body: # (9) - fraudCheckStatus: "FRAUD" - "rejection.reason": "Amount too high" - headers: # (10) - Content-Type: application/json;charset=UTF-8 - - -#From the Consumer perspective, when shooting a request in the integration test: -# -#(1) - If the consumer sends a request -#(2) - With the "PUT" method -#(3) - to the URL "/fraudcheck" -#(4) - with the JSON body that -# * has a field `client.id` -# * has a field `loanAmount` that is equal to `99999` -#(5) - with header `Content-Type` equal to `application/json` -#(6) - and a `client.id` json entry matches the regular expression `[0-9]{10}` -#(7) - then the response will be sent with -#(8) - status equal `200` -#(9) - and JSON body equal to -# { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -#(10) - with header `Content-Type` equal to `application/json` -# -#From the Producer perspective, in the autogenerated producer-side test: -# -#(1) - A request will be sent to the producer -#(2) - With the "PUT" method -#(3) - to the URL "/fraudcheck" -#(4) - with the JSON body that -# * has a field `client.id` `1234567890` -# * has a field `loanAmount` that is equal to `99999` -#(5) - with header `Content-Type` equal to `application/json` -#(7) - then the test will assert if the response has been sent with -#(8) - status equal `200` -#(9) - and JSON body equal to -# { "fraudCheckStatus": "FRAUD", "rejectionReason": "Amount too high" } -#(10) - with header `Content-Type` equal to `application/json;charset=UTF-8` +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/yml/http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.yml[] ---- The YML contract is quite straight-forward. However when you take a look at the Contract @@ -1148,33 +790,14 @@ First, add the `Spring Cloud Contract` BOM. [source,xml,indent=0] ---- - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-release.version} - pom - import - - - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=contract_bom,indent=0] ---- Next, add the `Spring Cloud Contract Verifier` Maven plugin [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-contract-maven-plugin - ${spring-cloud-contract.version} - true - - com.example.fraud - true - - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=contract_maven_plugin,indent=0] ---- Since the plugin was added, you get the `Spring Cloud Contract Verifier` features which, @@ -1230,28 +853,14 @@ Add the `Spring Cloud Contract` BOM: [source,xml,indent=0] ---- - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-release-train.version} - pom - import - - - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/pom.xml[tags=contract_bom,indent=0] ---- Add the dependency to `Spring Cloud Contract Stub Runner`: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-stub-runner - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/pom.xml[tags=stub_runner,indent=0] ---- Annotate your test class with `@AutoConfigureStubRunner`. In the annotation, provide the @@ -1261,12 +870,7 @@ can also provide the offline work switch (`StubRunnerProperties.StubsMode.LOCAL` [source,groovy,indent=0] ---- -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.NONE) -@AutoConfigureStubRunner(ids = { - "com.example:http-server-dsl:+:stubs:6565" }, stubsMode = StubRunnerProperties.StubsMode.LOCAL) -public class LoanApplicationServiceTests { - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-client/src/test/java/com/example/loan/LoanApplicationServiceTests.java[tags=autoconfigure_stubrunner,indent=0] ---- Now, when you run your tests, you see something like this: @@ -1305,9 +909,8 @@ As a reminder, you can see the initial implementation here: [source,java,indent=0] ---- -@RequestMapping(value = "/fraudcheck", method = PUT) -public FraudCheckResult fraudCheck(@RequestBody FraudCheck fraudCheck) { -return new FraudCheckResult(FraudCheckStatus.OK, NO_REASON); +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudDetectionController.java[tags=server_api,indent=0] +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudDetectionController.java[tags=initial_impl,indent=0] } ---- @@ -1323,27 +926,14 @@ You must add the dependencies needed by the autogenerated tests: [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-starter-contract-verifier - test - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=verifier_test_dependencies,indent=0] ---- In the configuration of the Maven plugin, pass the `packageWithBaseClasses` property [source,xml,indent=0] ---- - - org.springframework.cloud - spring-cloud-contract-maven-plugin - ${spring-cloud-contract.version} - true - - com.example.fraud - true - - +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/pom.xml[tags=contract_maven_plugin,indent=0] ---- IMPORTANT: This example uses "convention based" naming by setting the @@ -1359,52 +949,7 @@ start the server side `FraudDetectionController`. [source,java,indent=0] ---- -/* - * Copyright 2013-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.fraud; - -import io.restassured.module.mockmvc.RestAssuredMockMvc; -import org.junit.Before; - -public class FraudBase { - - @Before - public void setup() { - RestAssuredMockMvc.standaloneSetup(new FraudDetectionController(), - new FraudStatsController(stubbedStatsProvider())); - } - - private StatsProvider stubbedStatsProvider() { - return fraudType -> { - switch (fraudType) { - case DRUNKS: - return 100; - case ALL: - return 200; - } - return 0; - }; - } - - public void assertThatRejectionReasonIsNull(Object rejectionReason) { - assert rejectionReason == null; - } - -} +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/test/java/com/example/fraud/FraudBase.java[] ---- Now, if you run the `./mvnw clean install`, you get something like this: @@ -1461,12 +1006,9 @@ implementation: [source,java,indent=0] ---- -@RequestMapping(value = "/fraudcheck", method = PUT) -public FraudCheckResult fraudCheck(@RequestBody FraudCheck fraudCheck) { -if (amountGreaterThanThreshold(fraudCheck)) { - return new FraudCheckResult(FraudCheckStatus.FRAUD, AMOUNT_TOO_HIGH); -} -return new FraudCheckResult(FraudCheckStatus.OK, NO_REASON); +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudDetectionController.java[tags=server_api,indent=0] +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudDetectionController.java[tags=new_impl,indent=0] +Unresolved directive in verifier_introduction.adoc - include::{introduction_url}/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudDetectionController.java[tags=initial_impl,indent=0] } ---- @@ -1562,7 +1104,7 @@ Marcin Grzejszczak] === Spring Cloud Contract WireMock -:core_path: ../../../.. +:core_path: ../../.. :doc_samples: {core_path}/samples/wiremock-jetty :wiremock_tests: {core_path}/spring-cloud-contract-wiremock @@ -1582,32 +1124,8 @@ your test. The following code shows an example: [source,java,indent=0] ---- -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@AutoConfigureWireMock(port = 0) -public class WiremockForDocsTests { - - // A service that calls out over HTTP - @Autowired - private Service service; - - @Before - public void setup() { - this.service.setBase("http://localhost:" - + this.environment.getProperty("wiremock.server.port")); - } - - // Using the WireMock APIs in the normal way: - @Test - public void contextLoads() throws Exception { - // Stubbing WireMock - stubFor(get(urlEqualTo("/resource")).willReturn(aResponse() - .withHeader("Content-Type", "text/plain").withBody("Hello World!"))); - // We're asserting if WireMock responded properly - assertThat(this.service.go()).isEqualTo("Hello World!"); - } - -} +Unresolved directive in spring-cloud-wiremock.adoc - include::{doc_samples}/src/test/java/com/example/WiremockForDocsTests.java[tags=wiremock_test1] +Unresolved directive in spring-cloud-wiremock.adoc - include::{doc_samples}/src/test/java/com/example/WiremockForDocsTests.java[tags=wiremock_test2] ---- To start the stub server on a different port use (for example), @@ -1651,7 +1169,7 @@ stubs are stored under `/META-INF/group-id/artifact-id/versions/mappings/` folde [source,java,indent=0] ---- -@AutoConfigureWireMock(port = 0, stubs = "classpath*:/META-INF/**/mappings/**/*.json") +Unresolved directive in spring-cloud-wiremock.adoc - include::{wiremock_tests}/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationWithUrlResourceTests.java[tags=load_all_stubs] ---- === Using Files to Specify the Stub Bodies @@ -1679,36 +1197,8 @@ instance, as shown in the following example: [source,java,indent=0] ---- -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class WiremockForDocsClassRuleTests { - - // Start WireMock on some dynamic port - // for some reason `dynamicPort()` is not working properly - @ClassRule - public static WireMockClassRule wiremock = new WireMockClassRule( - WireMockSpring.options().dynamicPort()); - - // A service that calls out over HTTP to wiremock's port - @Autowired - private Service service; - - @Before - public void setup() { - this.service.setBase("http://localhost:" + wiremock.port()); - } - - // Using the WireMock APIs in the normal way: - @Test - public void contextLoads() throws Exception { - // Stubbing WireMock - wiremock.stubFor(get(urlEqualTo("/resource")).willReturn(aResponse() - .withHeader("Content-Type", "text/plain").withBody("Hello World!"))); - // We're asserting if WireMock responded properly - assertThat(this.service.go()).isEqualTo("Hello World!"); - } - -} +Unresolved directive in spring-cloud-wiremock.adoc - include::{doc_samples}/src/test/java/com/example/WiremockForDocsClassRuleTests.java[tags=wiremock_test1] +Unresolved directive in spring-cloud-wiremock.adoc - include::{doc_samples}/src/test/java/com/example/WiremockForDocsClassRuleTests.java[tags=wiremock_test2] ---- The `@ClassRule` means that the server shuts down after all the methods in this class @@ -1770,28 +1260,7 @@ a Spring `MockRestServiceServer`. The following code shows an example: [source,java,indent=0] ---- -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.NONE) -public class WiremockForDocsMockServerApplicationTests { - - @Autowired - private RestTemplate restTemplate; - - @Autowired - private Service service; - - @Test - public void contextLoads() throws Exception { - // will read stubs classpath - MockRestServiceServer server = WireMockRestServiceServer.with(this.restTemplate) - .baseUrl("http://example.org").stubs("classpath:/stubs/resource.json") - .build(); - // We're asserting if WireMock responded properly - assertThat(this.service.go()).isEqualTo("Hello World"); - server.verify(); - } - -} +Unresolved directive in spring-cloud-wiremock.adoc - include::{doc_samples}/src/test/java/com/example/WiremockForDocsMockServerApplicationTests.java[tags=wiremock_test] ---- The `baseUrl` value is prepended to all mock calls, and the `stubs()` method takes a stub @@ -1816,15 +1285,9 @@ Example: [source,java,indent=0] ---- - @Bean - WireMockConfigurationCustomizer optionsCustomizer() { - return new WireMockConfigurationCustomizer() { - @Override - public void customize(WireMockConfiguration options) { +Unresolved directive in spring-cloud-wiremock.adoc - include::{wiremock_tests}/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java[tags=customizer_1] // perform your customization here - } - }; - } +Unresolved directive in spring-cloud-wiremock.adoc - include::{wiremock_tests}/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockConfigurationCustomizerTests.java[tags=customizer_2] ---- === Generating Stubs using REST Docs @@ -1998,19 +1461,7 @@ Consider the following test: [source,java] ---- - this.mockMvc - .perform(post("/foo").accept(MediaType.APPLICATION_PDF) - .accept(MediaType.APPLICATION_JSON) - .contentType(MediaType.APPLICATION_JSON) - .content("{\"foo\": 23, \"bar\" : \"baz\" }")) - .andExpect(status().isOk()).andExpect(content().string("bar")) - // first WireMock - .andDo(WireMockRestDocs.verify().jsonPath("$[?(@.foo >= 20)]") - .jsonPath("$[?(@.bar in ['baz','bazz','bazzz'])]") - .contentType(MediaType.valueOf("application/json")) - .stub("shouldGrantABeerIfOldEnough")) - // then Contract DSL documentation - .andDo(document("index", SpringCloudContractRestDocs.dslContract())); +Unresolved directive in spring-cloud-wiremock.adoc - include::{wiremock_tests}/src/test/java/org/springframework/cloud/contract/wiremock/restdocs/ContractDslSnippetTests.java[tags=contract_snippet] ---- The preceding test creates the stub presented in the previous section, generating both @@ -2249,6 +1700,8 @@ IMPORTANT: You need to have all the necessary Groovy plugins IMPORTANT: Spring Cloud Contract builds Docker images. Remember to have Docker installed. +IMPORTANT: If you want to run the build in offline mode, you have to have Maven 3.5.2+ installed. + === Project structure Here you can find the Spring Cloud Contract folder structure diff --git a/docker/pom.xml b/docker/pom.xml index 5d103178fb..a9a40a3a8a 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-docker-parent pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Docker Parent Spring Cloud Contract Docker Parent diff --git a/docker/spring-cloud-contract-docker/pom.xml b/docker/spring-cloud-contract-docker/pom.xml index ec33943ab4..3e86780b1c 100644 --- a/docker/spring-cloud-contract-docker/pom.xml +++ b/docker/spring-cloud-contract-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-docker pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Docker Spring Cloud Contract Docker diff --git a/docker/spring-cloud-contract-docker/project/gradle.properties b/docker/spring-cloud-contract-docker/project/gradle.properties index 657bc7b2e2..32861173f8 100644 --- a/docker/spring-cloud-contract-docker/project/gradle.properties +++ b/docker/spring-cloud-contract-docker/project/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT +verifierVersion=2.2.0.BUILD-SNAPSHOT diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml index 53be57bcd5..b4c742b3c5 100644 --- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml +++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-docker-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-docker pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Stub Runner Docker Spring Cloud Contract Stub Runner Docker diff --git a/docs/pom.xml b/docs/pom.xml index 4be9977c10..39c5254d63 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-docs @@ -40,23 +40,16 @@ maven-dependency-plugin - org.asciidoctor - asciidoctor-maven-plugin - false + org.apache.maven.plugins + maven-resources-plugin - com.agilejava.docbkx - docbkx-maven-plugin + org.asciidoctor + asciidoctor-maven-plugin org.apache.maven.plugins maven-antrun-plugin - false - - - org.codehaus.mojo - build-helper-maven-plugin - false diff --git a/docs/src/main/asciidoc/spring-cloud-contract-verifier.adoc b/docs/src/main/asciidoc/spring-cloud-contract-verifier.adoc index 8f6b26b316..f8d4c512e7 100644 --- a/docs/src/main/asciidoc/spring-cloud-contract-verifier.adoc +++ b/docs/src/main/asciidoc/spring-cloud-contract-verifier.adoc @@ -1,5 +1,5 @@ -:core_path: ../../../.. -:plugins_path: ../../../../spring-cloud-contract-tools +:core_path: ../../.. +:plugins_path: ../../../spring-cloud-contract-tools :converters_path: {plugins_path}/spring-cloud-contract-converters :verifier_root_path: {core_path}/spring-cloud-contract-verifier :contract_spec_path: {core_path}/spring-cloud-contract-spec diff --git a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc index 311191ed29..234f6fd005 100644 --- a/docs/src/main/asciidoc/spring-cloud-wiremock.adoc +++ b/docs/src/main/asciidoc/spring-cloud-wiremock.adoc @@ -1,4 +1,4 @@ -:core_path: ../../../.. +:core_path: ../../.. :doc_samples: {core_path}/samples/wiremock-jetty :wiremock_tests: {core_path}/spring-cloud-contract-wiremock diff --git a/pom.xml b/pom.xml index fff0b2cb25..45ae94163b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 2.1.3.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT spring-cloud-contract-parent pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Spring Cloud Contract @@ -28,13 +28,13 @@ 2.17 3.5.13 0.0.9 - 2.1.3.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT - Fishtown.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + Germantown.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT 5.0.3 3.2.9 1.0-groovy-2.4 diff --git a/samples/pom.xml b/samples/pom.xml index ece2b9873b..de2f9f1dc5 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-samples pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Samples Spring Cloud Contract Samples diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index fd80e379fa..4c113e3e4a 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT - Greenwich.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT true diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index 3e2eb84942..6e09cc6cad 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index d3757fb212..1eaef1a492 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - Greenwich.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 1cd6b13d1d..a9ebf8384c 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT - Greenwich.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index d647c63811..0fbcf25072 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/pom.xml b/samples/standalone/messaging/pom.xml index 2271567349..2ccab6cd15 100644 --- a/samples/standalone/messaging/pom.xml +++ b/samples/standalone/messaging/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/messaging/stream-sink/gradle.properties +++ b/samples/standalone/messaging/stream-sink/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index fc036b1b2a..ad5f74fc65 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -15,14 +15,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Greenwich.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT pom import diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/messaging/stream-source/gradle.properties +++ b/samples/standalone/messaging/stream-source/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 652bcde55c..bb260198c4 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -15,14 +15,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT @@ -70,7 +70,7 @@ org.springframework.cloud spring-cloud-dependencies - Greenwich.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT pom import diff --git a/samples/standalone/pact/pact-http-client/gradle.properties b/samples/standalone/pact/pact-http-client/gradle.properties index 3e2eb84942..6e09cc6cad 100644 --- a/samples/standalone/pact/pact-http-client/gradle.properties +++ b/samples/standalone/pact/pact-http-client/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml index 4e95c07da0..5649ba6049 100644 --- a/samples/standalone/pact/pact-http-client/pom.xml +++ b/samples/standalone/pact/pact-http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - Greenwich.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/pact/pact-http-server/gradle.properties b/samples/standalone/pact/pact-http-server/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/pact/pact-http-server/gradle.properties +++ b/samples/standalone/pact/pact-http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml index e9da2343d5..d712d4b583 100644 --- a/samples/standalone/pact/pact-http-server/pom.xml +++ b/samples/standalone/pact/pact-http-server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT - Greenwich.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/pact/pom.xml b/samples/standalone/pact/pom.xml index 198218e1f6..b4c4ff8a68 100644 --- a/samples/standalone/pact/pom.xml +++ b/samples/standalone/pact/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -20,7 +20,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index e72b64e51f..9555c115c9 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-contract-samples - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-samples-standalone pom - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT Spring Cloud Contract Standalone Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 7ec433f870..cf24af6395 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -31,14 +31,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 6ea15a732f..ed748e0b4d 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT true diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index f06c288996..ad4aea6bf5 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/webclient/http-client/gradle.properties +++ b/samples/standalone/webclient/http-client/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 88f0e6b5f7..faec65b865 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties index a7626f1221..797b760468 100644 --- a/samples/standalone/webclient/http-server/gradle.properties +++ b/samples/standalone/webclient/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT \ No newline at end of file diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index fb0364afe6..3cd52f9ad2 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml index 6c6b976a7b..9cce2c73ce 100644 --- a/samples/standalone/webclient/pom.xml +++ b/samples/standalone/webclient/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-client/gradle.properties b/samples/standalone/yml/http-client/gradle.properties index 72d5eb58b7..535ecb91d1 100644 --- a/samples/standalone/yml/http-client/gradle.properties +++ b/samples/standalone/yml/http-client/gradle.properties @@ -1,2 +1,2 @@ org.gradle.daemon=false -BOM_VERSION=Greenwich.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml index 3dae11d93d..287e75bdea 100644 --- a/samples/standalone/yml/http-client/pom.xml +++ b/samples/standalone/yml/http-client/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - Greenwich.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-server/gradle.properties b/samples/standalone/yml/http-server/gradle.properties index 5f3a3dda8c..824726cc69 100644 --- a/samples/standalone/yml/http-server/gradle.properties +++ b/samples/standalone/yml/http-server/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=false -verifierVersion=2.1.2.BUILD-SNAPSHOT -BOM_VERSION=Greenwich.BUILD-SNAPSHOT +verifierVersion=2.2.0.BUILD-SNAPSHOT +BOM_VERSION=Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml index 8a6307b0d3..e47e31ef5b 100644 --- a/samples/standalone/yml/http-server/pom.xml +++ b/samples/standalone/yml/http-server/pom.xml @@ -14,15 +14,15 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT - Greenwich.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT + Hoxton.BUILD-SNAPSHOT diff --git a/samples/standalone/yml/pom.xml b/samples/standalone/yml/pom.xml index 72e226d8ab..d77b5eb2a3 100644 --- a/samples/standalone/yml/pom.xml +++ b/samples/standalone/yml/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-samples-standalone - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -19,7 +19,7 @@ - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 6161dfec07..c39a3e93e8 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-jetty - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock-jetty @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index ea87585efa..1ca33facd5 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-native - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock-native @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 5bd720cb66..18cd8d3a46 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-tomcat - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock-tomcat @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml index af0f8f0fa5..c21e179287 100644 --- a/samples/wiremock-undertow-ssl/pom.xml +++ b/samples/wiremock-undertow-ssl/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow-ssl - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock-undertow-ssl @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 71bbed3868..45f6657c6e 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock-undertow - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock-undertow @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/samples/wiremock/pom.xml b/samples/wiremock/pom.xml index c0c5ca468a..351ef0369c 100644 --- a/samples/wiremock/pom.xml +++ b/samples/wiremock/pom.xml @@ -5,7 +5,7 @@ 4.0.0 wiremock - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT jar wiremock @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT UTF-8 1.8 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index dba6d71e61..73a4b8eb62 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.3.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT spring-cloud-contract-dependencies - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT pom spring-cloud-contract-dependencies Spring Cloud Contract Dependencies diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml index cc1ff79565..b617001c4a 100644 --- a/spring-cloud-contract-shade/pom.xml +++ b/spring-cloud-contract-shade/pom.xml @@ -15,7 +15,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-shade diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 4cc6e4cf89..4ce7cf4157 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index 22d825766d..7ac0ce28e0 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml index 4ad4987a88..845036d942 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-stub-runner-jetty diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index c345cbb414..17d8b3774b 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-stub-runner diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml index 29de190653..f5125197f8 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-starters - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-starter-contract-verifier diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml index 3c84ea1c54..5892823bd2 100644 --- a/spring-cloud-contract-stub-runner-boot/pom.xml +++ b/spring-cloud-contract-stub-runner-boot/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-boot diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index 1962815eb2..a71bbdc63b 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 0853ae650c..8eb2983b2a 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml index 183ceb1fde..6517a8437e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-converters diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 5c3a776a4e..2df48dd49f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -15,7 +15,7 @@ # nexusUsername= nexusPassword= -verifierVersion=2.1.2.BUILD-SNAPSHOT +verifierVersion=2.2.0.BUILD-SNAPSHOT org.gradle.daemon=false aetherVersion=1.1.0 -springCloudBuildVersion=2.1.3.BUILD-SNAPSHOT +springCloudBuildVersion=2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml index 0bc0ae306f..ab9565348a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. 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 03e644a1f9..ee693a8033 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 @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.2.BUILD-SNAPSHOT +verifierVersion=2.2.0.BUILD-SNAPSHOT groovyVersion=2.4.15 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 c0c311dc00..1780eed2d8 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 @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.2.BUILD-SNAPSHOT -bootVersion=2.1.3.RELEASE +verifierVersion=2.2.0.BUILD-SNAPSHOT +bootVersion=2.2.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 c0c311dc00..1780eed2d8 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 @@ -15,5 +15,5 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.2.BUILD-SNAPSHOT -bootVersion=2.1.3.RELEASE +verifierVersion=2.2.0.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT 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 daad9e9b76..d118009e60 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 @@ -15,6 +15,6 @@ # wiremockVersion=2.20.0 jsonAssertVersion=0.4.13 -verifierVersion=2.1.2.BUILD-SNAPSHOT -bootVersion=2.1.3.RELEASE +verifierVersion=2.2.0.BUILD-SNAPSHOT +bootVersion=2.2.0.BUILD-SNAPSHOT groovyVersion=2.4.15 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 278b583183..eb7ae28dc8 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. @@ -47,7 +47,7 @@ 1.13.7 - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT 2016 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml index bee64344f7..2d2349383c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml index 5499f2ef02..8055475fd6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 8a58d18990..4ad9c779e4 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index d70ccb01a7..f366fc9432 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index 8a58d18990..4ad9c779e4 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.2.0.BUILD-SNAPSHOT diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml index 92cb52d02d..5a5812a748 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-pact diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 209d6a0e18..06d6e8be0e 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index af3aab3ff7..62504a7a1d 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 99ebbdbde0..a55f5f233c 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. diff --git a/tests/samples-messaging-amqp/pom.xml b/tests/samples-messaging-amqp/pom.xml index b3aa140858..f97b42beaf 100644 --- a/tests/samples-messaging-amqp/pom.xml +++ b/tests/samples-messaging-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-amqp diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index e1a564d549..bd78432292 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index e12f37aa3c..c6f381589f 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 28f2827985..85f6c39519 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-sample-stream diff --git a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml index 6f48bf308a..0f74a07e06 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-amqp diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml index a0547e41b7..84704c9fb6 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-boot-eureka diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml index a61a9c2d53..3ce3687e3b 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-boot-zookeeper diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index bb0cb5e071..0f01634093 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-camel diff --git a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml index 35dd372282..f167775e43 100644 --- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-context-path diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index 4e870e5cef..7cd650f1ef 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml index 70001c0629..475d8dccb8 100644 --- a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-moco-contract-jar diff --git a/tests/spring-cloud-contract-stub-runner-moco/pom.xml b/tests/spring-cloud-contract-stub-runner-moco/pom.xml index 3198b6e214..5f49a93009 100644 --- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-moco diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index aacec58e7e..e0cb0b01f5 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tests - 2.1.2.BUILD-SNAPSHOT + 2.2.0.BUILD-SNAPSHOT .. spring-cloud-contract-stub-runner-stream