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

Updated versions

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-10-18 12:16:30 +02:00
parent 96f8d2db5c dbf7f53e92
commit 7a66b5f5ba
13 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/src/main/asciidoc/getting-started.adoc
View File

@@ -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]
----
<build>
<plugins>
@@ -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]
----
<build>
<plugins>
@@ -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;

10
docs/src/main/asciidoc/using.adoc
View File

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

12
pom.xml
View File

@@ -24,8 +24,8 @@
<properties>
<!-- Align it also in Docker image under [docker/spring-cloud-contract-docker/project/gradle.properties] -->
<camel.version>3.15.0</camel.version>
<pact.version>4.3.6</pact.version>
<camel.version>3.19.0</camel.version>
<pact.version>4.3.15</pact.version>
<jsch-agent.version>0.0.9</jsch-agent.version>
<spring-cloud-build.version>4.0.0-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>4.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
@@ -36,15 +36,15 @@
<cglib.version>3.2.11</cglib.version>
<spock-spring.version>2.2-M1-groovy-4.0</spock-spring.version> <!-- @releaser:version-check-off -->
<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
<commons-text.version>1.9</commons-text.version>
<handlebars.version>4.2.0</handlebars.version>
<commons-text.version>1.10.0</commons-text.version>
<handlebars.version>4.3.0</handlebars.version>
<jgit.version>6.1.0.202203080745-r</jgit.version>
<javax-inject.version>1</javax-inject.version>
<json-unit-assertj.version>2.32.0</json-unit-assertj.version>
<rest-assured.version>5.1.0</rest-assured.version>
<junit-vintage.version>5.8.2</junit-vintage.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<junit-vintage.version>5.9.1</junit-vintage.version>
<junit-jupiter.version>5.9.1</junit-jupiter.version>
<gmavenplus-plugin.version>1.13.0</gmavenplus-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>

10
spring-cloud-contract-tools/spring-cloud-contract-pact/src/main/java/org/springframework/cloud/contract/stubrunner/PactStubDownloaderBuilder.java
View File

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

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy
View File

@@ -347,7 +347,7 @@ class PactContractConverterSpec extends Specification {
],
"metadata": {
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json
View File

@@ -147,7 +147,7 @@
],
"metadata": {
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json
View File

@@ -290,7 +290,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json
View File

@@ -98,7 +98,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json
View File

@@ -90,7 +90,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json
View File

@@ -70,7 +70,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json
View File

@@ -39,7 +39,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json
View File

@@ -38,7 +38,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json
View File

@@ -22,7 +22,7 @@
"version": "3.0.0"
},
"pact-jvm": {
"version": "4.3.6"
"version": "4.3.15"
}
}
}