diff --git a/reference/html/getting-started.html b/reference/html/getting-started.html
index c4c7a335a6..04150802e0 100644
--- a/reference/html/getting-started.html
+++ b/reference/html/getting-started.html
@@ -443,7 +443,7 @@ From the Producer perspective, in the autogenerated producer-side test:
request: # (1)
method: PUT # (2)
- url: /fraudcheck # (3)
+ url: /yamlfraudcheck # (3)
body: # (4)
"client.id": 1234567890
loanAmount: 99999
@@ -467,7 +467,7 @@ response: # (7)
#
#(1) - If the consumer sends a request
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id`
# * has a field `loanAmount` that is equal to `99999`
@@ -483,7 +483,7 @@ response: # (7)
#
#(1) - A request will be sent to the producer
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id` `1234567890`
# * has a field `loanAmount` that is equal to `99999`
@@ -1847,7 +1847,7 @@ From the Producer perspective, in the autogenerated producer-side test:
request: # (1)
method: PUT # (2)
- url: /fraudcheck # (3)
+ url: /yamlfraudcheck # (3)
body: # (4)
"client.id": 1234567890
loanAmount: 99999
@@ -1871,7 +1871,7 @@ response: # (7)
#
#(1) - If the consumer sends a request
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id`
# * has a field `loanAmount` that is equal to `99999`
@@ -1887,7 +1887,7 @@ response: # (7)
#
#(1) - A request will be sent to the producer
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id` `1234567890`
# * has a field `loanAmount` that is equal to `99999`
@@ -2002,16 +2002,24 @@ First, we add the Spring Cloud Contract BOM, as the following examp
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- <convertToYaml>true</convertToYaml>
- </configuration>
-</plugin>
+
<plugin>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-maven-plugin</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
+<!-- <convertToYaml>true</convertToYaml>-->
+ </configuration>
+ <!-- if additional dependencies are needed e.g. for Pact -->
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-pact</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
@@ -2269,16 +2277,24 @@ $ git pull https://your-git-server.com/server-side-fork.git contract-change-pr
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- <convertToYaml>true</convertToYaml>
- </configuration>
-</plugin>
+
<plugin>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-maven-plugin</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
+<!-- <convertToYaml>true</convertToYaml>-->
+ </configuration>
+ <!-- if additional dependencies are needed e.g. for Pact -->
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-pact</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
diff --git a/reference/html/howto.html b/reference/html/howto.html
index d6bfcbd1f9..c79a253d4a 100644
--- a/reference/html/howto.html
+++ b/reference/html/howto.html
@@ -1582,9 +1582,9 @@ set a metaData entry in the Pact file with the sentTo
"description": "",
"request": {
"method": "PUT",
- "path": "/fraudcheck",
+ "path": "/pactfraudcheck",
"headers": {
- "Content-Type": "application/vnd.fraud.v1+json"
+ "Content-Type": "application/json"
},
"body": {
"clientId": "1234567890",
@@ -1604,7 +1604,7 @@ set a metaData entry in the Pact file with the sentTo
"matchers": [
{
"match": "regex",
- "regex": "application/vnd\\.fraud\\.v1\\+json.*"
+ "regex": "application/json.*"
}
],
"combine": "AND"
@@ -1626,11 +1626,11 @@ set a metaData entry in the Pact file with the sentTo
"response": {
"status": 200,
"headers": {
- "Content-Type": "application/vnd.fraud.v1+json"
+ "Content-Type": "application/json"
},
"body": {
"fraudCheckStatus": "FRAUD",
- "rejectionReason": "Amount too high"
+ "rejection.reason": "Amount too high"
},
"matchingRules": {
"header": {
@@ -1638,7 +1638,7 @@ set a metaData entry in the Pact file with the sentTo
"matchers": [
{
"match": "regex",
- "regex": "application/vnd\\.fraud\\.v1\\+json.*"
+ "regex": "application/json.*"
}
],
"combine": "AND"
@@ -1686,28 +1686,14 @@ Maven and Gradle:
Maven
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-pact</artifactId>
- <version>${spring-cloud-contract.version}</version>
- </dependency>
- </dependencies>
-</plugin>
+
Gradle
-
classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
+
// if additional dependencies are needed e.g. for Pact
+classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
@@ -1790,17 +1776,13 @@ Maven and Gradle:
Maven
-
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-pact</artifactId>
- <scope>test</scope>
-</dependency>
+
Gradle
-
testCompile "org.springframework.cloud:spring-cloud-contract-pact"
+
diff --git a/reference/html/maven-project.html b/reference/html/maven-project.html
index 960db867de..29e7f8b055 100644
--- a/reference/html/maven-project.html
+++ b/reference/html/maven-project.html
@@ -201,16 +201,24 @@ following sections:
request: # (1)
method: PUT # (2)
- url: /fraudcheck # (3)
+ url: /yamlfraudcheck # (3)
body: # (4)
"client.id": 1234567890
loanAmount: 99999
@@ -1027,7 +1027,7 @@ response: # (7)
#
#(1) - If the consumer sends a request
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id`
# * has a field `loanAmount` that is equal to `99999`
@@ -1043,7 +1043,7 @@ response: # (7)
#
#(1) - A request will be sent to the producer
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id` `1234567890`
# * has a field `loanAmount` that is equal to `99999`
@@ -2401,7 +2401,7 @@ From the Producer perspective, in the autogenerated producer-side test:
request: # (1)
method: PUT # (2)
- url: /fraudcheck # (3)
+ url: /yamlfraudcheck # (3)
body: # (4)
"client.id": 1234567890
loanAmount: 99999
@@ -2425,7 +2425,7 @@ response: # (7)
#
#(1) - If the consumer sends a request
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id`
# * has a field `loanAmount` that is equal to `99999`
@@ -2441,7 +2441,7 @@ response: # (7)
#
#(1) - A request will be sent to the producer
#(2) - With the "PUT" method
-#(3) - to the URL "/fraudcheck"
+#(3) - to the URL "/yamlfraudcheck"
#(4) - with the JSON body that
# * has a field `client.id` `1234567890`
# * has a field `loanAmount` that is equal to `99999`
@@ -2556,16 +2556,24 @@ First, we add the Spring Cloud Contract BOM, as the following examp
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- <convertToYaml>true</convertToYaml>
- </configuration>
-</plugin>
+
<plugin>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-maven-plugin</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
+<!-- <convertToYaml>true</convertToYaml>-->
+ </configuration>
+ <!-- if additional dependencies are needed e.g. for Pact -->
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-pact</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
@@ -2823,16 +2831,24 @@ $ git pull https://your-git-server.com/server-side-fork.git contract-change-pr
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- <convertToYaml>true</convertToYaml>
- </configuration>
-</plugin>
+
<plugin>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-maven-plugin</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
+<!-- <convertToYaml>true</convertToYaml>-->
+ </configuration>
+ <!-- if additional dependencies are needed e.g. for Pact -->
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-contract-pact</artifactId>
+ <version>${spring-cloud-contract.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
@@ -15481,9 +15497,9 @@ set a metaData entry in the Pact file with the sentTo
"description": "",
"request": {
"method": "PUT",
- "path": "/fraudcheck",
+ "path": "/pactfraudcheck",
"headers": {
- "Content-Type": "application/vnd.fraud.v1+json"
+ "Content-Type": "application/json"
},
"body": {
"clientId": "1234567890",
@@ -15503,7 +15519,7 @@ set a metaData entry in the Pact file with the sentTo
"matchers": [
{
"match": "regex",
- "regex": "application/vnd\\.fraud\\.v1\\+json.*"
+ "regex": "application/json.*"
}
],
"combine": "AND"
@@ -15525,11 +15541,11 @@ set a metaData entry in the Pact file with the sentTo
"response": {
"status": 200,
"headers": {
- "Content-Type": "application/vnd.fraud.v1+json"
+ "Content-Type": "application/json"
},
"body": {
"fraudCheckStatus": "FRAUD",
- "rejectionReason": "Amount too high"
+ "rejection.reason": "Amount too high"
},
"matchingRules": {
"header": {
@@ -15537,7 +15553,7 @@ set a metaData entry in the Pact file with the sentTo
"matchers": [
{
"match": "regex",
- "regex": "application/vnd\\.fraud\\.v1\\+json.*"
+ "regex": "application/json.*"
}
],
"combine": "AND"
@@ -15585,28 +15601,14 @@ Maven and Gradle:
Maven
-
<plugin>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-maven-plugin</artifactId>
- <version>${spring-cloud-contract.version}</version>
- <extensions>true</extensions>
- <configuration>
- <packageWithBaseClasses>com.example.fraud</packageWithBaseClasses>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-pact</artifactId>
- <version>${spring-cloud-contract.version}</version>
- </dependency>
- </dependencies>
-</plugin>
+
Gradle
-
classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
+
// if additional dependencies are needed e.g. for Pact
+classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
@@ -15689,17 +15691,13 @@ Maven and Gradle:
Maven
-
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-contract-pact</artifactId>
- <scope>test</scope>
-</dependency>
+
Gradle
-
testCompile "org.springframework.cloud:spring-cloud-contract-pact"
+
diff --git a/reference/pdf/spring-cloud-contract.pdf b/reference/pdf/spring-cloud-contract.pdf
index 01e603b26e..b0892d47ea 100644
--- a/reference/pdf/spring-cloud-contract.pdf
+++ b/reference/pdf/spring-cloud-contract.pdf
@@ -5,16 +5,16 @@
/Author