Updates to version 4.0.0-SNAPSHOT (#1747)

* Updates to version 4.0.0-SNAPSHOT Updates to Java 17, framework 6, boot 3 and Jakarta EE Missing support for versions of rest assured, activemq-pool & jersey-client * Additional jdk17, spring cloud 2021, boot 3 upgrades * Fixed invalid version Co-authored-by: Marcin Grzejszczak <marcin@grzejszczak.pl> Co-authored-by: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2022-01-14 05:18:01 -05:00
parent dc1f55300a
commit dffe488857
89 changed files with 174 additions and 172 deletions
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -16,10 +16,10 @@ jobs:

    steps:
    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK
      uses: actions/setup-java@v1
      with:
-        java-version: 1.8
+        java-version: 17
    - name: Cache local Maven repository
      uses: actions/cache@v2
      with:
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=8.0.292.hs-adpt
+java=17.0.1-tem
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-docker-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker Parent</name>
 	<description>Spring Cloud Contract Docker Parent</description>

--- a/docker/spring-cloud-contract-docker/get_dependencies.sh
+++ b/docker/spring-cloud-contract-docker/get_dependencies.sh
@@ -2,7 +2,7 @@

 set -e

-WRAPPER_VERSION="7.3"
+WRAPPER_VERSION="7.3.3"
 GRADLE_BIN_DIR="gradle-${WRAPPER_VERSION}-bin"
 GRADLE_WRAPPER_DIR="${HOME}/.gradle/wrapper/dists/${GRADLE_BIN_DIR}"
 CURRENT_DIR="$( pwd )"
--- a/docker/spring-cloud-contract-docker/pom.xml
+++ b/docker/spring-cloud-contract-docker/pom.xml
@@ -6,19 +6,19 @@
 	<properties>
 		<dependency-management-plugin.version>1.0.8.RELEASE</dependency-management-plugin.version>
 		<plexus-archiver.version>4.2.5</plexus-archiver.version>
-		<sdkman-java-installation.version>8.0.292.hs-adpt</sdkman-java-installation.version>
+		<sdkman-java-installation.version>17.0.1-tem</sdkman-java-installation.version>
 	</properties>

 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-docker-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-docker</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Docker</name>
 	<description>Spring Cloud Contract Docker</description>

--- a/docker/spring-cloud-contract-docker/project/gradle.properties
+++ b/docker/spring-cloud-contract-docker/project/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-springBootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+springBootVersion=3.0.0-SNAPSHOT
 camelVersion=3.11.0
--- a/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
+++ b/docker/spring-cloud-contract-stub-runner-docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04

-ARG SDKMAN_JAVA_INSTALLATION=8.0.292.hs-adpt
+ARG SDKMAN_JAVA_INSTALLATION=17.0.1-tem

 LABEL Author="Marcin Grzejszczak <mgrzejszczak@pivotal.io>"
 LABEL Author="Bastian Doetsch <bdoetsch@vmware.com>"
--- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml
+++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-docker-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-stub-runner-docker</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Stub Runner Docker</name>
 	<description>Spring Cloud Contract Stub Runner Docker</description>

--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-docs</artifactId>
--- a/guides/gs-contract-rest/README.adoc
+++ b/guides/gs-contract-rest/README.adoc
@@ -18,7 +18,7 @@ You'll setup two micro services one providing its contract, and the other one co

 == What you'll need

-:java_version: 1.8
+:java_version: 17
 include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/prereq_editor_jdk_buildtools.adoc[]

 include::https://raw.githubusercontent.com/spring-guides/getting-started-macros/master/how_to_complete_this_guide.adoc[]
--- a/guides/gs-contract-rest/complete/contract-rest-client/build.gradle
+++ b/guides/gs-contract-rest/complete/contract-rest-client/build.gradle
@@ -17,8 +17,8 @@ version = '0.0.1'
 bootJar {
 	baseName = 'contract-rest-client'
 }
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 repositories { mavenCentral() }

--- a/guides/gs-contract-rest/complete/contract-rest-client/pom.xml
+++ b/guides/gs-contract-rest/complete/contract-rest-client/pom.xml
@@ -11,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
 	</properties>

 	<dependencies>
--- a/guides/gs-contract-rest/complete/contract-rest-service/build.gradle
+++ b/guides/gs-contract-rest/complete/contract-rest-service/build.gradle
@@ -25,8 +25,8 @@ version = '0.0.1'
 bootJar {
 	baseName = 'contract-rest-service'
 }
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 repositories { mavenCentral() }

--- a/guides/gs-contract-rest/complete/contract-rest-service/pom.xml
+++ b/guides/gs-contract-rest/complete/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/guides/gs-contract-rest/initial/contract-rest-client/build.gradle
+++ b/guides/gs-contract-rest/initial/contract-rest-client/build.gradle
@@ -16,8 +16,8 @@ bootJar {
 	baseName = 'contract-rest-client'
 	version = '0.0.1'
 }
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 repositories { mavenCentral() }

--- a/guides/gs-contract-rest/initial/contract-rest-client/pom.xml
+++ b/guides/gs-contract-rest/initial/contract-rest-client/pom.xml
@@ -11,13 +11,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>

 	<dependencies>
--- a/guides/gs-contract-rest/initial/contract-rest-service/build.gradle
+++ b/guides/gs-contract-rest/initial/contract-rest-service/build.gradle
@@ -23,8 +23,8 @@ bootJar {
 	baseName = 'contract-rest-service'
 	version = '0.0.1'
 }
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 repositories { mavenCentral() }

--- a/guides/gs-contract-rest/initial/contract-rest-service/pom.xml
+++ b/guides/gs-contract-rest/initial/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud.version>2021.0.1-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud.version>2022.0.0-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/guides/pom.xml
+++ b/guides/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-guides</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<artifactId>spring-cloud-contract-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>

 	<name>Spring Cloud Contract</name>
 	<description>Spring Cloud Contract</description>
@@ -27,12 +27,12 @@
 		<camel.version>3.11.0</camel.version>
 		<pact.version>4.1.23</pact.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
-		<spring-cloud-build.version>3.1.1-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-zookeeper.version>3.1.1-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-stream.version>3.2.1</spring-cloud-stream.version>
-		<spring-cloud-netflix.version>3.1.1-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-consul.version>3.1.1-SNAPSHOT</spring-cloud-consul.version>
-		<spring-cloud-commons.version>3.1.1-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-build.version>4.0.0-SNAPSHOT</spring-cloud-build.version>
+		<spring-cloud-zookeeper.version>4.0.0-SNAPSHOT</spring-cloud-zookeeper.version>
+		<spring-cloud-stream.version>4.0.0-SNAPSHOT</spring-cloud-stream.version>
+		<spring-cloud-netflix.version>4.0.0-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-consul.version>4.0.0-SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-commons.version>4.0.0-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-functiondonotreplace.version>3.0.6.RELEASE</spring-cloud-functiondonotreplace.version>
 		<jopt-simple.version>5.0.4</jopt-simple.version>
 		<cglib.version>3.2.11</cglib.version>
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-samples</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Samples</name>
 	<description>Spring Cloud Contract Samples</description>

--- a/samples/standalone/contracts/com/example/server/pom.xml
+++ b/samples/standalone/contracts/com/example/server/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2021.0.0-SNAPSHOT</spring-cloud-release.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-release.version>2022.0.0-SNAPSHOT</spring-cloud-release.version>
 		<excludeBuildFolders>true</excludeBuildFolders>
 	</properties>

--- a/samples/standalone/dsl/http-client/gradle.properties
+++ b/samples/standalone/dsl/http-client/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/dsl/http-client/pom.xml
+++ b/samples/standalone/dsl/http-client/pom.xml
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-release-train.version>2021.0.0-SNAPSHOT</spring-cloud-release-train.version>
+		<java.version>17</java.version>
+		<spring-cloud-release-train.version>2022.0.0-SNAPSHOT</spring-cloud-release-train.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/dsl/http-server/gradle.properties
+++ b/samples/standalone/dsl/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -14,15 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2021.0.0-SNAPSHOT</spring-cloud-release.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-release.version>2022.0.0-SNAPSHOT</spring-cloud-release.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/dsl/pom.xml
+++ b/samples/standalone/dsl/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

@@ -19,7 +19,7 @@
 	</description>

 	<properties>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/standalone/pom.xml
+++ b/samples/standalone/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-samples-standalone</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Standalone Test Samples</name>
 	<description>Spring Cloud Contract Standalone Test Samples used for end to end tests
 	</description>
--- a/samples/standalone/restdocs/http-client/gradle.properties
+++ b/samples/standalone/restdocs/http-client/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -31,14 +31,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/restdocs/http-server/gradle.properties
+++ b/samples/standalone/restdocs/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 		<spring.cloud.contract.verifier.jar.skip>true
 		</spring.cloud.contract.verifier.jar.skip>
 	</properties>
--- a/samples/standalone/restdocs/pom.xml
+++ b/samples/standalone/restdocs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

@@ -19,7 +19,7 @@
 	</description>

 	<properties>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/samples/standalone/webclient/http-client/gradle.properties
+++ b/samples/standalone/webclient/http-client/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/webclient/http-client/pom.xml
+++ b/samples/standalone/webclient/http-client/pom.xml
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/webclient/http-server/gradle.properties
+++ b/samples/standalone/webclient/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
-verifierVersion=3.1.1-SNAPSHOT
-BOM_VERSION=2021.0.0-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+BOM_VERSION=2022.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
--- a/samples/standalone/webclient/http-server/pom.xml
+++ b/samples/standalone/webclient/http-server/pom.xml
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<java.version>17</java.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
--- a/samples/standalone/webclient/pom.xml
+++ b/samples/standalone/webclient/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-samples-standalone</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

@@ -19,7 +19,7 @@
 	</description>

 	<properties>
-		<spring-cloud-contract.version>3.1.1-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>4.0.0-SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<modules>
--- a/scripts/runTests.sh
+++ b/scripts/runTests.sh
@@ -4,7 +4,7 @@ source common.sh || source scripts/common.sh || echo "No common.sh script found.

 set -e

-[[ -z "${VERSION_VALUE}" ]] && VERSION_VALUE="1.0.0.BUILD-SNAPSHOT"
+[[ -z "${VERSION_VALUE}" ]] && VERSION_VALUE="4.0.0.BUILD-SNAPSHOT"
 [[ -z "${VERIFIER_VERSION}" ]] && VERIFIER_VERSION="$VERSION_VALUE"
 export VERIFIER_VERSION

--- a/scripts/updateWrappers.sh
+++ b/scripts/updateWrappers.sh
@@ -5,7 +5,7 @@ set -o errtrace
 set -o nounset
 set -o pipefail

-export WRAPPER_VERSION="${WRAPPER_VERSION:-6.3}"
+export WRAPPER_VERSION="${WRAPPER_VERSION:-7.3.3}"

 find . -name 'build.gradle' | while read -r file; do
    parentdir="$(dirname "$file")"
--- a/specs/pom.xml
+++ b/specs/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

 	<artifactId>spring-cloud-contract-specs</artifactId>
 	<packaging>pom</packaging>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<name>Spring Cloud Contract Specs</name>
 	<description>Spring Cloud Contract Specs</description>

--- a/specs/spring-cloud-contract-spec-groovy/pom.xml
+++ b/specs/spring-cloud-contract-spec-groovy/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-groovy</artifactId>
--- a/specs/spring-cloud-contract-spec-java/pom.xml
+++ b/specs/spring-cloud-contract-spec-java/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-java</artifactId>
--- a/specs/spring-cloud-contract-spec-kotlin/pom.xml
+++ b/specs/spring-cloud-contract-spec-kotlin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec-kotlin</artifactId>
@@ -55,7 +55,7 @@
 				<version>${contract.kotlin.version}</version>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<configuration>
-					<jvmTarget>1.8</jvmTarget>
+					<jvmTarget>17</jvmTarget>
 				</configuration>
 				<executions>
 					<execution>
--- a/specs/spring-cloud-contract-spec/pom.xml
+++ b/specs/spring-cloud-contract-spec/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-spec</artifactId>
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.0</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-contract-dependencies</name>
 	<description>Spring Cloud Contract Dependencies</description>
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-shade</artifactId>
--- a/spring-cloud-contract-starters/pom.xml
+++ b/spring-cloud-contract-starters/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
+++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>
--- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
+++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
--- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
+++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-starters</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-contract-verifier</artifactId>
--- a/spring-cloud-contract-stub-runner-boot/pom.xml
+++ b/spring-cloud-contract-stub-runner-boot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot</artifactId>
--- a/spring-cloud-contract-stub-runner/pom.xml
+++ b/spring-cloud-contract-stub-runner/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner</artifactId>
--- a/spring-cloud-contract-tools/pom.xml
+++ b/spring-cloud-contract-tools/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-converters</artifactId>
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
@@ -20,9 +20,6 @@ ext {
 	JavaVersion javaVer = JavaVersion.current()
 	println "Current Java version equal to [${javaVer}]"
 	javaVersionNumber = javaVer.toString()
-	
-	jgitVersion = "5.12.0.202106070339-r"
-	jschVersion = "0.0.9"
 }

 project.version = findProperty('verifierVersion')
@@ -33,8 +30,8 @@ apply from: "$rootDir/gradle/release.gradle"

 group = 'org.springframework.cloud'

-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 repositories {
 	mavenLocal()
@@ -61,15 +58,15 @@ dependencies {
 	implementation(platform("org.springframework.cloud:spring-cloud-contract-tools:${project.version}"))

 	// Need to set the versions manually cause otherwise Gradle will not publish a proper pom
-	implementation "org.apache.maven.resolver:maven-resolver-api:1.4.1"
+	implementation "org.apache.maven.resolver:maven-resolver-api:${mavenResolverVersion}"
 	implementation "org.eclipse.jgit:org.eclipse.jgit:${jgitVersion}"
 	implementation "org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:${jgitVersion}"
 	implementation "com.jcraft:jsch.agentproxy.jsch:${jschVersion}"
 	implementation "com.jcraft:jsch.agentproxy.sshagent:${jschVersion}"
 	implementation "com.jcraft:jsch.agentproxy.usocket-jna:${jschVersion}"
-	implementation "com.fasterxml.jackson.core:jackson-databind:2.11.4"
+	implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"

-	implementation "org.springframework:spring-core:5.3.9"
+	implementation "org.springframework:spring-core:${springVersion}"
 	implementation("org.springframework.cloud:spring-cloud-contract-shade:${project.version}")
 	api("org.springframework.cloud:spring-cloud-contract-stub-runner:${project.version}") {
 		exclude(group: '*')
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
@@ -15,7 +15,12 @@
 #
 nexusUsername=
 nexusPassword=
-verifierVersion=3.1.1-SNAPSHOT
+verifierVersion=4.0.0-SNAPSHOT
 org.gradle.daemon=false
 aetherVersion=1.1.0
-springCloudBuildVersion=3.1.1-SNAPSHOT
+springCloudBuildVersion=4.0.0-SNAPSHOT
+springVersion=6.0.0-SNAPSHOT
+jacksonDatabindVersion=2.11.4
+mavenResolverVersion=1.4.1
+jgitVersion=5.12.0.202106070339-r
+jschVersion=0.0.9
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle
@@ -12,8 +12,8 @@ apply plugin: 'spring-cloud-contract'
 apply plugin: 'maven-publish'

 group = 'org.springframework.cloud.testprojects'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17

 ext {
 	restAssuredVersion = '3.0.7'
--- 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
@@ -15,5 +15,5 @@
 #
 wiremockVersion=2.30.1
 jsonAssertVersion=0.6.1
-verifierVersion=3.1.1-SNAPSHOT
+verifierVersion=4.0.0-SNAPSHOT
 groovyVersion=2.4.17
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle
@@ -31,8 +31,8 @@ group = 'org.springframework.cloud.testprojects'
 subprojects {
 	apply plugin: 'groovy'

-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
+	sourceCompatibility = 17
+	targetCompatibility = 17
 	version = "1.0.0"

 	repositories {
--- 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
@@ -15,6 +15,6 @@
 #
 wiremockVersion=2.30.1
 jsonAssertVersion=0.6.1
-verifierVersion=3.1.1-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
 groovyVersion=2.4.17
--- 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
@@ -15,6 +15,6 @@
 #
 wiremockVersion=2.30.1
 jsonAssertVersion=0.6.1
-verifierVersion=3.1.1-SNAPSHOT
-bootVersion=2.6.1
+verifierVersion=4.0.0-SNAPSHOT
+bootVersion=3.0.0-SNAPSHOT
 groovyVersion=2.4.17
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-portal-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -77,7 +77,7 @@
 	</dependencies>

 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<spring-cloud-verifier-plugin.version>${it-plugin.version}
 		</spring-cloud-verifier-plugin.version>
 	</properties>
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -75,7 +75,7 @@
 	</dependencies>

 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<spring-cloud-verifier-plugin.version>${it-plugin.version}
 		</spring-cloud-verifier-plugin.version>
 	</properties>
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -59,7 +59,7 @@
 	</dependencies>

 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<spring-cloud-verifier-plugin.version>${it-plugin.version}
 		</spring-cloud-verifier-plugin.version>
 	</properties>
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -65,7 +65,7 @@
 	</dependencies>

 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<spring-cloud-verifier-plugin.version>${it-plugin.version}
 		</spring-cloud-verifier-plugin.version>
 	</properties>
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.1</version>
+		<version>3.0.0-SNAPSHOT</version>
 	</parent>

 	<dependencies>
@@ -59,7 +59,7 @@
 	</dependencies>

 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<spring-cloud-verifier-plugin.version>${it-plugin.version}
 		</spring-cloud-verifier-plugin.version>
 	</properties>
--- a/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tools</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-pact</artifactId>
--- a/spring-cloud-contract-verifier/pom.xml
+++ b/spring-cloud-contract-verifier/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-verifier</artifactId>
--- a/spring-cloud-contract-wiremock/pom.xml
+++ b/spring-cloud-contract-wiremock/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-wiremock</artifactId>
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-parent</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

--- a/tests/samples-messaging-amqp/pom.xml
+++ b/tests/samples-messaging-amqp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-amqp</artifactId>
--- a/tests/samples-messaging-camel/pom.xml
+++ b/tests/samples-messaging-camel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-camel</artifactId>
--- a/tests/samples-messaging-integration/pom.xml
+++ b/tests/samples-messaging-integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-integration</artifactId>
--- a/tests/samples-messaging-jms/pom.xml
+++ b/tests/samples-messaging-jms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-sample-jms</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-amqp/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-amqp/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-amqp</artifactId>
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Contract Stub Runner AMQP</name>
 	<description>Spring Cloud Contract Stub Runner AMQP</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
--- a/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot-eureka</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-boot-zookeeper</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-context-path/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-context-path/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-context-path</artifactId>
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Contract Stub Runner With Context Path</name>
 	<description>Spring Cloud Contract Stub Runner With Context Path</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
--- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Contract Stub Runner Integration</name>
 	<description>Spring Cloud Contract Stub Runner Integration</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
--- a/tests/spring-cloud-contract-stub-runner-jms/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-jms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-jms</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-kafka/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-kafka/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-kafka</artifactId>
--- a/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-moco-contract-jar</artifactId>
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Contract Stub Runner Moco Contract Jar</name>
 	<description>Spring Cloud Contract Stub Runner Moco Contract Jar</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
--- a/tests/spring-cloud-contract-stub-runner-moco/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-moco/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-moco</artifactId>
@@ -14,7 +14,7 @@
 	<name>Spring Cloud Contract Stub Runner Moco</name>
 	<description>Spring Cloud Contract Stub Runner Moco</description>
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<moco-runner.version>1.2.0</moco-runner.version>
 	</properties>
 	<dependencies>
--- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml
+++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-contract-tests</artifactId>
-		<version>3.1.1-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>