From 82e630eb698c97beff3ef25a4821fc739fb8af2c Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 12 Jul 2021 17:14:45 +0200
Subject: [PATCH 1/2] Update maven.yml

---
 .github/workflows/maven.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a738d65641..89dae17e11 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ 3.0.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ 3.0.x ]
 
 jobs:
   build:
@@ -28,4 +28,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Build with Maven
-      run: ./mvnw clean install -B -U
+      run: ./mvnw clean install -B -U -Pspring

From 9f6b17a5759bfd9877450a629f637c28994298bb Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 12 Jul 2021 19:18:25 +0200
Subject: [PATCH 2/2] Bumped WireMock to 2.29 (#1680)

* Bumped WireMock to 2.29

* Update pom.xml
---
 spring-cloud-contract-dependencies/pom.xml                     | 3 +--
 .../test/resources/functionalTest/bootSimple/gradle.properties | 2 +-
 .../resources/functionalTest/scenarioProject/gradle.properties | 2 +-
 .../functionalTest/scenarioProjectKotlin/gradle.properties     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index aad8431830..40cd2c98f1 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -15,7 +15,7 @@
 	<name>spring-cloud-contract-dependencies</name>
 	<description>Spring Cloud Contract Dependencies</description>
 	<properties>
-		<wiremock.version>2.28.1</wiremock.version>
+		<wiremock.version>2.29.0</wiremock.version>
 		<jsonassert.version>0.6.1</jsonassert.version>
 	</properties>
 	<dependencyManagement>
@@ -111,7 +111,6 @@
 				<artifactId>jsonassert</artifactId>
 				<version>${jsonassert.version}</version>
 			</dependency>
-			<!-- This has shadowed deps -->
 			<dependency>
 				<groupId>com.toomuchcoding.jsonassert</groupId>
 				<artifactId>jsonassert-shade</artifactId>
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
index 302ea63685..0fce57421a 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-wiremockVersion=2.28.1
+wiremockVersion=2.29.0
 jsonAssertVersion=0.6.1
 verifierVersion=3.0.4-SNAPSHOT
 groovyVersion=2.4.17
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
index 48b738d0cb..a027f6e1a0 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-wiremockVersion=2.28.1
+wiremockVersion=2.29.0
 jsonAssertVersion=0.6.1
 verifierVersion=3.0.4-SNAPSHOT
 bootVersion=2.4.7
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
index 48b738d0cb..a027f6e1a0 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProjectKotlin/gradle.properties
@@ -13,7 +13,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-wiremockVersion=2.28.1
+wiremockVersion=2.29.0
 jsonAssertVersion=0.6.1
 verifierVersion=3.0.4-SNAPSHOT
 bootVersion=2.4.7