diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java
index a4b24b7b5d..9b9367c02d 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ProjectVersion.java
@@ -167,10 +167,7 @@ class ProjectVersion implements Comparable<ProjectVersion>, Serializable {
 		return ReleaseType.SNAPSHOT;
 	}
 
-	/*
-	 * E.g. 1.0.1.RELEASE is more mature than 1.0.2.RC2
-	 */
-	boolean isMoreMature(ProjectVersion that) {
+	int isMoreMature(ProjectVersion that) {
 		SplitVersion thisSplit = assertVersion();
 		SplitVersion thatSplit = that.assertVersion();
 		int releaseTypeComparison = this.releaseType.compareTo(that.releaseType);
@@ -179,16 +176,30 @@ class ProjectVersion implements Comparable<ProjectVersion>, Serializable {
 				&& that.isReleaseOrServiceRelease();
 		// 1.0.1.M2 vs 1.0.0.RELEASE (x)
 		if (thisReleaseTypeHigher && !bothGa) {
-			return true;
+			return 1;
 		}
-		int versionComparison = thisSplit.gav().compareTo(thatSplit.gav());
-		if (versionComparison == 0) {
-			// 1.0.0.SR1 vs 1.0.1.RELEASE (x)
-			// Finchley.RELEASE vs Finchley.SR1 (x)
-			return thisReleaseTypeHigher;
+		int majorComparison = compare(thisSplit.major, thatSplit.major);
+		if (majorComparison != 0) {
+			return majorComparison;
+		}
+		int minorComparison = compare(thisSplit.minor, thatSplit.minor);
+		if (minorComparison != 0) {
+			return minorComparison;
+		}
+		int patchComparison = compare(thisSplit.patch, thatSplit.patch);
+		if (patchComparison != 0) {
+			return patchComparison;
+		}
+		return releaseTypeComparison;
+	}
+
+	private int compare(String thisString, String thatString) {
+		try {
+			return Integer.valueOf(thisString).compareTo(Integer.valueOf(thatString));
+		}
+		catch (NumberFormatException ex) {
+			return thisString.compareTo(thatString);
 		}
-		// 1.0.0.SR1 vs 1.0.1.RELEASE (x)
-		return versionComparison > 0;
 	}
 
 	boolean isSameWithoutSuffix(ProjectVersion that) {
@@ -223,7 +234,6 @@ class ProjectVersion implements Comparable<ProjectVersion>, Serializable {
 
 	@Override
 	public int compareTo(ProjectVersion o) {
-		// very simple comparison
 		return this.version.compareTo(o.version);
 	}
 
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java
index 5a81b259c5..3e709df2f1 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/ScmStubDownloaderBuilder.java
@@ -403,8 +403,6 @@ class FileWalker extends SimpleFileVisitor<Path> {
 
 class DefaultArtifactVersionWrapper implements Comparable<DefaultArtifactVersionWrapper> {
 
-	private static final String SNAPSHOT_SUBSTRING = "snapshot";
-
 	final DefaultArtifactVersion version;
 
 	final File file;
@@ -427,8 +425,7 @@ class DefaultArtifactVersionWrapper implements Comparable<DefaultArtifactVersion
 
 	@Override
 	public int compareTo(DefaultArtifactVersionWrapper o) {
-		return this.projectVersion.isMoreMature(o.projectVersion) ? 1
-				: this.projectVersion.version.equals(o.projectVersion.version) ? 0 : -1;
+		return this.projectVersion.isMoreMature(o.projectVersion);
 	}
 
 }
diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java
index 7624545e49..3ff11da5f8 100644
--- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java
+++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/GitStubDownloaderTests.java
@@ -136,6 +136,13 @@ public class GitStubDownloaderTests {
 		then(entry).isNotNull();
 		then(entry.getValue().getAbsolutePath()).contains("com.example" + File.separator
 				+ "beer-api-producer-external" + File.separator + "1.0.0.BUILD-SNAPSHOT");
+
+		entry = stubDownloader.downloadAndUnpackStubJar(
+				new StubConfiguration("com.issue1305:beer-api-producer-external:+"));
+
+		then(entry).isNotNull();
+		then(entry.getValue().getAbsolutePath()).contains("com.issue1305" + File.separator
+				+ "beer-api-producer-external" + File.separator + "0.0.11-SNAPSHOT");
 	}
 
 	@Test
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.10-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.11-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.5-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.6-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.7-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
new file mode 100644
index 0000000000..0a124cc494
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendAcceptedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a positive verification message when person is eligible to get the beer
+
+```
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll send a message with a positive verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'accepted_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsOldEnough()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: true
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
new file mode 100644
index 0000000000..0fc31c1634
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/messaging/shouldSendRejectedVerification.groovy
@@ -0,0 +1,49 @@
+/*
+ * 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
+ *
+ *      https://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.beer.messaging
+
+org.springframework.cloud.contract.spec.Contract.make {
+	description("""
+Sends a negative verification message when person is not eligible to get the beer
+
+```
+given:
+	client is too young
+when:
+	he applies for a beer
+then:
+	we'll send a message with a negative verification
+```
+
+""")
+	// Label by means of which the output message can be triggered
+	label 'rejected_verification'
+	// input to the contract
+	input {
+		// the contract will be triggered by a method
+		triggeredBy('clientIsTooYoung()')
+	}
+	// output message of the contract
+	outputMessage {
+		// destination to which the output message will be sent
+		sentTo 'verifications'
+		// the body of the output message
+		body([
+				eligible: false
+		])
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
new file mode 100644
index 0000000000..d9ab57c992
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a successful scenario of getting a beer
+
+given:
+	client is old enough
+when:
+	he applies for a beer
+then:
+	we'll grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[2-9][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
new file mode 100644
index 0000000000..b0cdfa5512
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/contracts/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.groovy
@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      https://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.beer.rest
+
+org.springframework.cloud.contract.spec.Contract.make {
+	request {
+		description("""
+Represents a unsuccessful scenario of getting a beer
+
+given:
+	client is not old enough
+when:
+	he applies for a beer
+then:
+	we'll NOT grant him the beer
+""")
+		method 'POST'
+		url '/check'
+		body(
+				age: value(consumer(regex('[0-1][0-9]')))
+		)
+		headers {
+			header 'Content-Type', 'application/json'
+		}
+	}
+	response {
+		status 200
+		body("""
+			{
+				"status": "NOT_OK"
+			}
+			""")
+		headers {
+			header(
+					'Content-Type',
+					value(consumer('application/json'), producer(regex('application/json.*')))
+			)
+		}
+	}
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
new file mode 100644
index 0000000000..5f25f6f934
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldGrantABeerIfOldEnough.json
@@ -0,0 +1,28 @@
+{
+  "id": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[2-9][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "e5413ef6-0f3e-4b81-9e78-7a90b53c6ed1"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
new file mode 100644
index 0000000000..9a4d31b7e5
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/META-INF/com.issue1305/beer-api-producer-external/0.0.8-SNAPSHOT/mappings/beer-api-consumer/rest/shouldRejectABeerIfTooYoung.json
@@ -0,0 +1,28 @@
+{
+  "id": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08",
+  "request": {
+    "url": "/check",
+    "method": "POST",
+    "headers": {
+      "Content-Type": {
+        "equalTo": "application/json"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "matchesJsonPath": "$[?(@.['age'] =~ /[0-1][0-9]/)]"
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "body": "{\"status\":\"NOT_OK\"}",
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "transformers": [
+      "response-template"
+    ]
+  },
+  "uuid": "b54426aa-b2ef-4b12-adc9-a05fcf6a4e08"
+}
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/COMMIT_EDITMSG b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/COMMIT_EDITMSG
new file mode 100644
index 0000000000..4907586b9a
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/COMMIT_EDITMSG
@@ -0,0 +1 @@
+Issue 1305
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/index b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/index
index 3eff85dae3..4953b4eea5 100644
Binary files a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/index and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/index differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/HEAD b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/HEAD
index abed8dd31c..ce0663ddbc 100644
--- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/HEAD
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/HEAD
@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 0b36113e5fa9713025d50f046e8fd209fc8d9597 Marcin Grzejszczak <mgrzejszczak@pivotal.io> 1522062299 +0200	clone: from git@github.com:marcingrzejszczak/contract-git.git
 0b36113e5fa9713025d50f046e8fd209fc8d9597 3bd42890d5105a30abd82d0205b63cbf20a59e83 Marcin Grzejszczak <mgrzejszczak@pivotal.io> 1547107982 +0100	commit: Added more versions
+3bd42890d5105a30abd82d0205b63cbf20a59e83 49c8705a4409b1a4bd0f767665632c6ae11b5b90 Marcin Grzejszczak <marcin.grzejszczak@gmail.com> 1581521766 +0100	commit: Issue 1305
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master
index abed8dd31c..ce0663ddbc 100644
--- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/logs/refs/heads/master
@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 0b36113e5fa9713025d50f046e8fd209fc8d9597 Marcin Grzejszczak <mgrzejszczak@pivotal.io> 1522062299 +0200	clone: from git@github.com:marcingrzejszczak/contract-git.git
 0b36113e5fa9713025d50f046e8fd209fc8d9597 3bd42890d5105a30abd82d0205b63cbf20a59e83 Marcin Grzejszczak <mgrzejszczak@pivotal.io> 1547107982 +0100	commit: Added more versions
+3bd42890d5105a30abd82d0205b63cbf20a59e83 49c8705a4409b1a4bd0f767665632c6ae11b5b90 Marcin Grzejszczak <marcin.grzejszczak@gmail.com> 1581521766 +0100	commit: Issue 1305
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab
new file mode 100644
index 0000000000..b0dfc0b00f
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/04/f59ff38f1c76629d41d71f38dcb87afecdf9ab differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0a/124cc494496bf3574617f02e505975e8d64e5c b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0a/124cc494496bf3574617f02e505975e8d64e5c
new file mode 100644
index 0000000000..dd2f353d3a
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0a/124cc494496bf3574617f02e505975e8d64e5c differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d
new file mode 100644
index 0000000000..9fef121906
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0b/b008b1d235cb760e13408f10662dda01027d1d differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1
new file mode 100644
index 0000000000..659754a795
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/0f/c31c163430ef5913e1a85b3a6c4e36bcbf32e1 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f
new file mode 100644
index 0000000000..46cdecb609
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/1e/bb28e0982e1e497fe57311c4f8f34bae6f382f differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/35/c8489a4e3d4761ae82a8606ea82e0e52b05376 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/35/c8489a4e3d4761ae82a8606ea82e0e52b05376
new file mode 100644
index 0000000000..660b0fba8e
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/35/c8489a4e3d4761ae82a8606ea82e0e52b05376 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/46/ea77fbb81bcd831368a980a2c296014be94bf8 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/46/ea77fbb81bcd831368a980a2c296014be94bf8
new file mode 100644
index 0000000000..6dab19f9f1
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/46/ea77fbb81bcd831368a980a2c296014be94bf8 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90
new file mode 100644
index 0000000000..f684debe0e
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/49/c8705a4409b1a4bd0f767665632c6ae11b5b90
@@ -0,0 +1,2 @@
+x
��1N1�aj�bz�hl��^	�t�{�a	�"����Y�p
�^Y[[8�O��ed�E$��j	E%��gJ����GJ曻��,�K3
+Y$��Y�tH9���C�Y�7�k�w�e����e���_;]��|m�|���^�R��l
��"�C��C�e̼m�C�z$��)Tz
\ No newline at end of file
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19
new file mode 100644
index 0000000000..c1cbce1fd0
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4d/48d4d56d4bf80700498dcb29d326c0ab35cb19 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2
new file mode 100644
index 0000000000..e064506abc
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/4e/5ffb7085c01081f98321985b6663f64939cdb2 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807
new file mode 100644
index 0000000000..5308a6f92e
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/57/4590052afef4af132f7b8c5b92682401635807 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18
new file mode 100644
index 0000000000..81af1360ef
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5b/0ae7cddbd14fc6ced6f87f4b9587afd6b0bd18 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a
new file mode 100644
index 0000000000..b36fe165e7
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/25f6f934c0e7e5dcc18e1bd831dd288fa6ad8a
@@ -0,0 +1,4 @@
+x
�Q�N�0�ܯ�,���I����@��VjoIN2!����PU���+$���󛷌�BG��W�c<O��q�ƃ��#�h6s���T����H���k�l� 
�q���
+N�A��q,
3�)�����@&P��,��BP(6�
+.pz!Yl�ՖUU��\+��h�;g���nm.�t�]ID�����}̎QJ���$��Y�k�������7���9�P�Cߥù
:�$ٹ�L��9G�%6�w����.8�|��k�ۿo����XKeR]���K�
+��*$¾ɹA����{m���
\ No newline at end of file
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/8216428856a5d6240f82dda04f348ba8bb742c b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/8216428856a5d6240f82dda04f348ba8bb742c
new file mode 100644
index 0000000000..4720cc9e55
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/5f/8216428856a5d6240f82dda04f348ba8bb742c differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e
new file mode 100644
index 0000000000..9b672595db
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/9c03cba4276c76c43b9a307ed00f39dc44616e differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799
new file mode 100644
index 0000000000..922f3ca3fc
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/61/fcad6942801c44ad275671c7d125efb564f799 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d
new file mode 100644
index 0000000000..237b8a7492
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/62/589edd12a37dd28b6b6fed1e2d728ac9f05c8d differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622
new file mode 100644
index 0000000000..e5b6e05c8d
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/63/201c9f9cfbe294f3f314df8b9c94cfee88e622 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/6e/06f676c9ba4459c1feb922de8ee603ea6bebce b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/6e/06f676c9ba4459c1feb922de8ee603ea6bebce
new file mode 100644
index 0000000000..ea9ab16cf8
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/6e/06f676c9ba4459c1feb922de8ee603ea6bebce differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5
new file mode 100644
index 0000000000..6123d79f37
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/78/3688df3e22c6b8e1d8f58167baf4f511d369c5 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e
new file mode 100644
index 0000000000..8f25538fb0
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/90/126ac925d26698516838a646e286e037acd55e differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/95/f833faccac8775b5528e38f3c30b9036d5c538 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/95/f833faccac8775b5528e38f3c30b9036d5c538
new file mode 100644
index 0000000000..b2f617b34b
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/95/f833faccac8775b5528e38f3c30b9036d5c538 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560
new file mode 100644
index 0000000000..e5a0b4f668
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9a/4d31b7e5ca02bf207e3b04b2312ee9585ee560 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc
new file mode 100644
index 0000000000..f414071fef
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/9e/5ec949f441e1828b21b7760ded76c1d42ea9bc differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/a1/84578130917b3bf6a6568f900f66c1ed0e72e1 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/a1/84578130917b3bf6a6568f900f66c1ed0e72e1
new file mode 100644
index 0000000000..a3d919d659
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/a1/84578130917b3bf6a6568f900f66c1ed0e72e1 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e
new file mode 100644
index 0000000000..407c78baaa
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/b0/cdfa5512c23af490d213948c7bdcd76d59a93e differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/c4/25167fb2a107afddca629fad83f8603fe2c215 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/c4/25167fb2a107afddca629fad83f8603fe2c215
new file mode 100644
index 0000000000..5f758a05b7
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/c4/25167fb2a107afddca629fad83f8603fe2c215 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/5d733109a6de5ea294154f1612aaf5cb9ae06b b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/5d733109a6de5ea294154f1612aaf5cb9ae06b
new file mode 100644
index 0000000000..7ea82e915e
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/5d733109a6de5ea294154f1612aaf5cb9ae06b differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999
new file mode 100644
index 0000000000..0b1fea88e1
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d2/ccedaea7b8739a11c17c91561cc2ace0a0a999 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa
new file mode 100644
index 0000000000..3467337ffb
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d7/2fbbffa2d0b1ea0707df4b533f3adf69383eaa differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906
new file mode 100644
index 0000000000..12e2653df7
--- /dev/null
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/d9/ab57c99263dac1e164883dcb7e06c542b89906
@@ -0,0 +1,6 @@
+x
m�QO�0���|�S^Ң6�����´
+�N�!�׹&�������s��ت6�}����;;��l�����7��`f��UE������.'�KC�J�
+D�Kci�߹��8�RI�shu�6$M!)����+Z�����\5�C���ؙj�m<���r�U>Jl<(
��M�����exN_���m_�l������˅ |/�Sz߸�ɤ�Lə�Ť�r����|�:��>�ZW�X��*K�7;
ɒbCb+�>�E�yò;�������NXd��rުM���ֻ
��r
q��
+�>NW�Ո���ן��k��^]M���
+�W0[.����rA�O0]���|q6$f�|l,;�6*�y��B���c��8�]�Rm�$k�hE�P���A��V���H`Β*U+/|�z�
/�4�c�|υ���
+�]�A���qL�3�X*�������LV�ͳ��)�2���Y-�~�w�*�m���V5,c�$I|���'��Z)	����ѾV�$zn-`5q\�ԧq$	���GĪP��(�1����W�X�S	'v�VVPv��@3�&ECY#��/��:�qk+H'tj�=7&�
�?���)<���
1pm�v`���Azw<>�vwH�t8��+Q�1t�D?��y���z�`:��ߴ�h��͏|��K�zL�9jf��pH� �y�(�E�>��B���T����#d�(z%'Ԋ^Y�W�p�5y+�
���� �`�)����2
\ No newline at end of file
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d
new file mode 100644
index 0000000000..b5c4d4136d
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fc/a3d789524348301d622344c8375d89b40f8b5d differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fe/2d022c3d254c5c7a5a65783e6976fac499d9c6 b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fe/2d022c3d254c5c7a5a65783e6976fac499d9c6
new file mode 100644
index 0000000000..d5eb98f9e0
Binary files /dev/null and b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/objects/fe/2d022c3d254c5c7a5a65783e6976fac499d9c6 differ
diff --git a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master
index 7bfe38929e..73fc07ed64 100644
--- a/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master
+++ b/spring-cloud-contract-stub-runner/src/test/resources/git_samples/contract-git/git/refs/heads/master
@@ -1 +1 @@
-3bd42890d5105a30abd82d0205b63cbf20a59e83
+49c8705a4409b1a4bd0f767665632c6ae11b5b90
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
index 3ef43f10c0..cde070ea33 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
@@ -157,7 +157,11 @@ public class WireMockConfiguration implements SmartLifecycle {
 	void resetMappings() {
 		if (this.server.isRunning()) {
 			this.server.resetAll();
+			this.server.resetRequests();
+			this.server.resetScenarios();
 			WireMock.reset();
+			WireMock.resetAllRequests();
+			WireMock.resetAllScenarios();
 			registerStubs();
 			logRegisteredMappings();
 		}