Merge branch '3.0.x' into main

.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

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>

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

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

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