From 1ed9002b2fcde014299ecf1136a80a11615b27e1 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 14 Jun 2022 13:46:32 +0200
Subject: [PATCH] Merge branch '3.1.x'

---
 samples/standalone/dsl/http-server/pom.xml       | 6 ------
 samples/standalone/restdocs/http-client/pom.xml  | 5 -----
 samples/standalone/restdocs/http-server/pom.xml  | 5 -----
 samples/standalone/restdocs/pom.xml              | 8 --------
 samples/standalone/webclient/http-client/pom.xml | 5 -----
 samples/standalone/webclient/http-server/pom.xml | 5 -----
 samples/standalone/webclient/pom.xml             | 8 --------
 7 files changed, 42 deletions(-)

diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml
index 0e6479ad4d..aeeb2ae68d 100644
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -20,14 +20,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2021.0.3-SNAPSHOT</spring-cloud-release.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml
index 65ec77a761..1765a460f2 100644
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -37,14 +37,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 		<rest-assured.version>5.0.2-SNAPSHOT</rest-assured.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml
index 14cc52d712..de3f2d308a 100644
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -20,13 +20,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 		<spring.cloud.contract.verifier.jar.skip>true
 		</spring.cloud.contract.verifier.jar.skip>
 		<rest-assured.version>5.0.2-SNAPSHOT</rest-assured.version>
diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml
index f75bdfa12f..254279206d 100644
--- a/samples/standalone/restdocs/pom.xml
+++ b/samples/standalone/restdocs/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-<<<<<<< HEAD
 		<version>4.0.0-SNAPSHOT</version>
-=======
-		<version>3.1.4-SNAPSHOT</version>
->>>>>>> 3.1.x
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -23,12 +19,8 @@
 	</description>
 
 	<properties>
-<<<<<<< HEAD
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 		<skipTests>true</skipTests>
-=======
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<modules>
diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml
index de40d7aaeb..16b5dfc905 100644
--- a/samples/standalone/webclient/http-client/pom.xml
+++ b/samples/standalone/webclient/http-client/pom.xml
@@ -20,13 +20,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml
index 0a0e86567b..2fb9954121 100644
--- a/samples/standalone/webclient/http-server/pom.xml
+++ b/samples/standalone/webclient/http-server/pom.xml
@@ -20,13 +20,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-<<<<<<< HEAD
 		<java.version>17</java.version>
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/webclient/pom.xml b/samples/standalone/webclient/pom.xml
index 777e15916e..d0270f3966 100644
--- a/samples/standalone/webclient/pom.xml
+++ b/samples/standalone/webclient/pom.xml
@@ -7,11 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-<<<<<<< HEAD
 		<version>4.0.0-SNAPSHOT</version>
-=======
-		<version>3.1.4-SNAPSHOT</version>
->>>>>>> 3.1.x
 		<relativePath>..</relativePath>
 	</parent>
 
@@ -23,11 +19,7 @@
 	</description>
 
 	<properties>
-<<<<<<< HEAD
 		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
-=======
-		<spring-cloud-contract.version>3.1.4-SNAPSHOT</spring-cloud-contract.version>
->>>>>>> 3.1.x
 	</properties>
 
 	<modules>