diff --git a/docs/src/main/asciidoc/getting-started.adoc b/docs/src/main/asciidoc/getting-started.adoc index 856103c013..ceacee8d3d 100644 --- a/docs/src/main/asciidoc/getting-started.adoc +++ b/docs/src/main/asciidoc/getting-started.adoc @@ -214,7 +214,7 @@ controller setup or messaging test setup). The following example, from `pom.xml`, shows how to specify the base test class: ==== -[src,xml] +[source,xml,indent=0] ---- @@ -591,7 +591,7 @@ contain all the setup necessary information needed to run them (for example, The following example, from `pom.xml`, shows how to specify the base test class: ==== -[src,xml] +[source,xml,indent=0] ---- @@ -618,7 +618,7 @@ of a `configuration` element within `spring-cloud-contract-maven-plugin`. The following example shows a minimal (but functional) base test class: ==== -[src,Java] +[source,java, indent=0] ---- package com.example.contractTest; @@ -643,7 +643,7 @@ Now we can move on to the implementation. For that, we first need a data class, then use in our controller. The following listing shows the data class: ==== -[src,Java] +[source,java, indent=0] ---- package com.example.Test; @@ -682,7 +682,7 @@ client ID in the contract is called `client.id`, we need to use the Now we can move along to the controller, which the following listing shows: ==== -[src,Java] +[source,java, indent=0] ---- package com.example.docTest; diff --git a/docs/src/main/asciidoc/using.adoc b/docs/src/main/asciidoc/using.adoc index 760491d1e1..2fcb312744 100644 --- a/docs/src/main/asciidoc/using.adoc +++ b/docs/src/main/asciidoc/using.adoc @@ -28,7 +28,7 @@ that contains all the stubs for each producer. For an example of such a project, As a result of pushing stubs there, the repository has the following structure: ==== -[src, bash] +[source,bash,indent=0] ---- $ tree . └── META-INF @@ -239,7 +239,7 @@ For example, for a producer named `producer` and a consumer named `consumer`, th . Once the contracts are defined, installs the producer stubs to local storage, as the following example shows: + ==== -[src,bash] +[source,bash,indent=0] ---- $ cd src/main/resource/contracts/producer $ ./mvnw clean install @@ -285,7 +285,7 @@ The producer: from the command line, as follows + ==== -[src,bash] +[source,bash,indent=0] ---- $ git checkout -b the_branch_with_pull_request master git pull https://github.com/user_id/project_name.git the_branch_with_pull_request @@ -294,7 +294,7 @@ git pull https://github.com/user_id/project_name.git the_branch_with_pull_reques . Installs the contract definitions, as follows + ==== -[src,bash] +[source,bash,indent=0] ---- $ ./mvnw clean install ---- @@ -358,7 +358,7 @@ contracts { . Merges the pull request to the repository with contract definitions, as follows: + ==== -[src,bash] +[source,bash,indent=0] ---- $ git commit -am "Finished the implementation to make the contract tests pass" $ git checkout master diff --git a/pom.xml b/pom.xml index 0a8011eeaf..0957de3853 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,8 @@ - 3.15.0 - 4.3.6 + 3.19.0 + 4.3.15 0.0.9 4.0.0-SNAPSHOT 4.0.0-SNAPSHOT @@ -36,15 +36,15 @@ 3.2.11 2.2-M1-groovy-4.0 0.2.2 - 1.9 - 4.2.0 + 1.10.0 + 4.3.0 6.1.0.202203080745-r 1 2.32.0 5.1.0 - 5.8.2 - 5.8.2 + 5.9.1 + 5.9.1 1.13.0 3.0.0-M7 diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java index 09c8269616..525a120db5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java @@ -350,10 +350,20 @@ class PactStubDownloader implements StubDownloader { return resolver.resolveValue("pactbroker.providerTags", "").split(","); } + @Override + public String providerBranch() { + return resolver.resolveValue("pactbroker.providerBranch", ""); + } + @Override public String includeWipPactsSince() { return resolver.resolveValue("pactbroker.includeWipPactsSince", ""); } + + @Override + public String enableInsecureTls() { + return resolver.resolveValue("pactbroker.enableInsecureTls", "false"); + } }); } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy index 653fcee032..c7e971b1e7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy @@ -347,7 +347,7 @@ class PactContractConverterSpec extends Specification { ], "metadata": { "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json index 01482db5ef..610c08b326 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json @@ -147,7 +147,7 @@ ], "metadata": { "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json index fb4b46ac7c..406d3bde8f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json @@ -290,7 +290,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json index 35df366410..65e06360f4 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json @@ -98,7 +98,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json index 2cd20b9f07..672a9ef561 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json @@ -90,7 +90,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json index b305a8f737..9ec4725556 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json @@ -70,7 +70,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json index bc18e0f5a7..87d265e569 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json @@ -39,7 +39,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json index 0f29c52e0a..7c8311b17b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json @@ -38,7 +38,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json index ee9bd7e744..920dfa26d6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json @@ -22,7 +22,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.3.6" + "version": "4.3.15" } } }