From 9ff913971368464ab1f879ca3911ea90093e4607 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Tue, 30 Jan 2024 15:51:44 +0530
Subject: [PATCH] Java 30497 Upgrade spring-cloud-contract project to JDK17
 (#15743)

---
 pom.xml                                            | 4 ++--
 spring-cloud-modules/pom.xml                       | 2 +-
 spring-cloud-modules/spring-cloud-contract/pom.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f54e755e69..1783126809 100644
--- a/pom.xml
+++ b/pom.xml
@@ -828,7 +828,7 @@
                 <module>spring-boot-rest</module>
                 <module>spring-cloud-modules/spring-cloud-azure</module>
                 <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
-                <!--<module>spring-cloud-modules/spring-cloud-contract</module>--><!-- failing after upgrading to jdk17-->
+                <module>spring-cloud-modules/spring-cloud-contract</module>
                 <!--<module>spring-cloud-modules/spring-cloud-data-flow</module>--><!-- failing after upgrading to jdk17-->
                 <module>spring-cloud-modules/spring-cloud-eureka</module>
                 <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
@@ -1067,7 +1067,7 @@
                 <module>spring-boot-rest</module>
                 <module>spring-cloud-modules/spring-cloud-azure</module>
                 <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
-                <!--<module>spring-cloud-modules/spring-cloud-contract</module>--><!-- failing after upgrading to jdk17-->
+                <module>spring-cloud-modules/spring-cloud-contract</module>
                 <!--<module>spring-cloud-modules/spring-cloud-data-flow</module>--><!-- failing after upgrading to jdk17-->
                 <module>spring-cloud-modules/spring-cloud-eureka</module>
                 <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index ccc8590b0b..2613b9f9ce 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -34,7 +34,7 @@
         <module>spring-cloud-aws-v3</module>
         <module>spring-cloud-consul</module>
         <!--        <module>spring-cloud-zuul-eureka-integration</module>-->
-        <!--        <module>spring-cloud-contract</module>-->
+        <module>spring-cloud-contract</module>
         <module>spring-cloud-kubernetes</module>
         <module>spring-cloud-open-service-broker</module>
         <module>spring-cloud-archaius</module>
diff --git a/spring-cloud-modules/spring-cloud-contract/pom.xml b/spring-cloud-modules/spring-cloud-contract/pom.xml
index 5a987d2862..3044bc3a74 100644
--- a/spring-cloud-modules/spring-cloud-contract/pom.xml
+++ b/spring-cloud-modules/spring-cloud-contract/pom.xml
@@ -60,7 +60,7 @@
     <properties>
         <spring-cloud.version>4.0.3</spring-cloud.version>
         <spring-cloud-contract.version>4.0.4</spring-cloud-contract.version>
-        <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
+        <spring-boot.version>2.7.11</spring-boot.version>
         <groovy.version>2.5.6</groovy.version>
     </properties>