From c0171ff7ce8b9c02c475fa14fd25cdf8c3293e60 Mon Sep 17 00:00:00 2001
From: Anastasios Ioannidis
 <121166333+anastasiosioannidis@users.noreply.github.com>
Date: Tue, 20 Jun 2023 20:28:00 +0300
Subject: [PATCH] Upgrade spring-cloud-contract, spring-cloud-data-flow to JDK
 17 (#14263)

* Upgrade spring-cloud-contract, spring-cloud-data-flow to JDK 17

* JAVA-22207 Refactored groovy version
---
 pom.xml                                       |  2 ++
 spring-cloud-modules/pom.xml                  |  4 +--
 .../spring-cloud-contract/pom.xml             |  2 +-
 .../spring-cloud-contract-consumer/pom.xml    | 10 ++++++
 .../spring-cloud-contract-producer/pom.xml    | 16 +++++++---
 .../data-flow-server/pom.xml                  | 32 ++++++++-----------
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index b8bc85d634..e1d97532c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -730,6 +730,8 @@
                 <module>spring-batch-2</module>
                 <module>spring-boot-rest</module>
                 <module>spring-drools</module>
+                <module>spring-cloud-modules/spring-cloud-contract</module>
+                <module>spring-cloud-modules/spring-cloud-data-flow</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index dafc5b628e..3fd2f118dc 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -32,7 +32,7 @@
         <module>spring-cloud-aws</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>
@@ -52,7 +52,7 @@
         <module>spring-cloud-dapr</module>
         <module>spring-cloud-docker</module>
         <module>spring-cloud-bus</module>
-        <module>spring-cloud-data-flow</module>
+<!--        <module>spring-cloud-data-flow</module>-->
         <module>spring-cloud-sleuth</module>
         <module>spring-cloud-open-telemetry</module>
         <module>spring-cloud-azure</module>
diff --git a/spring-cloud-modules/spring-cloud-contract/pom.xml b/spring-cloud-modules/spring-cloud-contract/pom.xml
index bfbac19a81..7a9c8c32cd 100644
--- a/spring-cloud-modules/spring-cloud-contract/pom.xml
+++ b/spring-cloud-modules/spring-cloud-contract/pom.xml
@@ -60,7 +60,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
+        <spring-cloud.version>4.0.3</spring-cloud.version>
         <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
index b561000a83..680e2e1795 100644
--- a/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
+++ b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml
@@ -40,6 +40,16 @@
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-xml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
index b80b86580f..35dd9596f7 100644
--- a/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
+++ b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml
@@ -29,6 +29,16 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.groovy</groupId>
+                    <artifactId>groovy-xml</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>
@@ -36,7 +46,7 @@
             <plugin>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
-                <version>${spring-cloud.version}</version>
+                <version>2.1.1.RELEASE</version>
                 <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
@@ -46,8 +56,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
-    </properties>
-
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
index 9b33411aaa..73b5aeb26d 100644
--- a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/pom.xml
@@ -17,13 +17,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dataflow-dependencies</artifactId>
@@ -31,13 +24,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -45,6 +31,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-dataflow-server-local</artifactId>
+            <version>1.7.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -62,13 +49,22 @@
             <version>${byte-buddy.version}</version>
             <scope>test</scope>
         </dependency>
+         <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
     <properties>
-        <spring-cloud-dataflow-dependencies.version>1.3.1.RELEASE</spring-cloud-dataflow-dependencies.version>
-        <spring-cloud-dependencies.version>Edgware.SR6</spring-cloud-dependencies.version>
-        <hibernate.compatible.version>5.2.12.Final</hibernate.compatible.version>
-        <spring-boot.version>1.5.22.RELEASE</spring-boot.version>
+        <spring-cloud-dataflow-dependencies.version>2.0.0.RELEASE</spring-cloud-dataflow-dependencies.version>
+        <hibernate.compatible.version>5.6.0.Final</hibernate.compatible.version>
+        <spring-boot.version>2.1.4.RELEASE</spring-boot.version>
+        <groovy.version>3.0.8</groovy.version>
     </properties>
 
 </project>
\ No newline at end of file