From 1912c8c618831bc4cf58ce52c6e53d95365c1753 Mon Sep 17 00:00:00 2001
From: Gaetano Piazzolla <gae.piaz@gmail.com>
Date: Wed, 11 Oct 2023 09:14:39 +0200
Subject: [PATCH] JAVA-22296 | Upgrade spring-cloud-modules to JDK 17: Chunk 4
 - integration tests fix (#14907)

spring-cloud-contract, spring-cloud-data-flow
---
 pom.xml                                       |  1 +
 .../spring-cloud-contract/pom.xml             | 13 +++++++---
 .../spring-cloud-contract-consumer/pom.xml    | 24 ++++++++++++-------
 .../spring-cloud-contract-producer/pom.xml    | 22 ++++++++++++-----
 ...aFlowServerApplicationIntegrationTest.java |  6 +++++
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6853b10587..197074c455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1005,6 +1005,7 @@
                 <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>
+                <module>spring-cloud-modules/spring-cloud-data-flow</module>
                 <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
                 <module>spring-cloud-modules/spring-cloud-stream-starters</module>
                 <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
diff --git a/spring-cloud-modules/spring-cloud-contract/pom.xml b/spring-cloud-modules/spring-cloud-contract/pom.xml
index 7a9c8c32cd..f2d0d1b5b0 100644
--- a/spring-cloud-modules/spring-cloud-contract/pom.xml
+++ b/spring-cloud-modules/spring-cloud-contract/pom.xml
@@ -41,28 +41,35 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-wiremock</artifactId>
-                <version>${spring-cloud.version}</version>
+                <version>${spring-cloud-contract.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-stub-runner</artifactId>
-                <version>${spring-cloud.version}</version>
+                <version>${spring-cloud-contract.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-starter-contract-verifier</artifactId>
-                <version>${spring-cloud.version}</version>
+                <version>${spring-cloud-contract.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <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>
         <log4j2.version>2.17.1</log4j2.version>
+        <groovy.version>2.5.6</groovy.version>
     </properties>
 
 </project>
\ No newline at end of file
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 680e2e1795..a8c3337de5 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
@@ -16,6 +16,15 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-rest</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-contract-wiremock</artifactId>
@@ -26,20 +35,13 @@
             <artifactId>spring-cloud-contract-stub-runner</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-rest</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.baeldung.spring.cloud</groupId>
             <artifactId>spring-cloud-contract-producer</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -50,6 +52,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+        </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 35dd9596f7..eb80f8d3dd 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
@@ -16,19 +16,17 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-contract-verifier</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -39,6 +37,18 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-contract-verifier</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -46,7 +56,7 @@
             <plugin>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-contract-maven-plugin</artifactId>
-                <version>2.1.1.RELEASE</version>
+                <version>${spring-cloud-contract.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
diff --git a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
index 68f0db60eb..49eb255303 100644
--- a/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
+++ b/spring-cloud-modules/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/com/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java
@@ -9,6 +9,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.session.data.redis.config.ConfigureRedisAction;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -39,5 +40,10 @@ public class DataFlowServerApplicationIntegrationTest {
 
             return factory;
         }
+
+        @Bean
+        public static ConfigureRedisAction configureRedisAction() {
+            return ConfigureRedisAction.NO_OP;
+        }
     }
 }