From d5bd9bf2956f03bc5326cdba91192c94df100317 Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Mon, 18 Oct 2021 10:38:41 -0400
Subject: [PATCH] Update Spring Cloud Function and Spring Cloud Stream

There is a partition issue that was addressed in SCFn and SCSt and needs to be
picked by the apps.

Update both SCFn and SCSt to 3.1.5-SNAPSHOT.

See relevant commits below in SCFn and SCSt for more details.

https://github.com/spring-cloud/spring-cloud-function/commit/0cb5483d0ae4e93c22dbd176447b3cec9746c20b
https://github.com/spring-cloud/spring-cloud-stream/commit/c2326740ed70a0e03fab099530ab30974fa05b6a
---
 applications/stream-applications-core/pom.xml | 21 ++++++++++++-------
 functions/spring-functions-parent/pom.xml     |  2 +-
 stream-applications-build/pom.xml             |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index c222a606..345e0ff3 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -21,8 +21,8 @@
         <java-functions.version>1.1.1-SNAPSHOT</java-functions.version>
         <apps.base-image>springcloud/baseimage:1.0.0</apps.base-image>
         <mockserver.version>5.10</mockserver.version>
-        <spring-cloud-stream-dependencies.version>3.1.4</spring-cloud-stream-dependencies.version>
-        <spring-cloud-stream.version>3.1.4</spring-cloud-stream.version>
+        <spring-cloud-stream-dependencies.version>3.1.5-SNAPSHOT</spring-cloud-stream-dependencies.version>
+        <spring-cloud-stream.version>3.1.5-SNAPSHOT</spring-cloud-stream.version>
         <spring-cloud-dataflow-apps-generator-plugin.version>1.0.5</spring-cloud-dataflow-apps-generator-plugin.version>
         <spring-cloud-dataflow-apps-docs-plugin.version>1.0.5</spring-cloud-dataflow-apps-docs-plugin.version>
         <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.5</spring-cloud-dataflow-apps-metadata-plugin.version>
@@ -50,6 +50,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-function-dependencies</artifactId>
+                <version>${spring-cloud-function.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-stream-dependencies</artifactId>
@@ -161,6 +166,12 @@
                                 </metadata>
                                 <maven>
                                     <dependencyManagement>
+                                        <!-- Temporarily override SC-Fn dependency by giving it the highest precedence since 2020.0.5 release of spring-cloud will not take place until December -->
+                                        <dependency>
+                                            <groupId>org.springframework.cloud</groupId>
+                                            <artifactId>spring-cloud-function-dependencies</artifactId>
+                                            <version>${spring-cloud-function.version}</version>
+                                        </dependency>
                                         <dependency>
                                             <groupId>org.springframework.cloud</groupId>
                                             <artifactId>spring-cloud-stream-dependencies</artifactId>
@@ -178,11 +189,7 @@
                                             <artifactId>function-dependencies</artifactId>
                                             <version>${java-functions.version}</version>
                                         </dependency>
-                                        <dependency>
-                                            <groupId>org.springframework.cloud</groupId>
-                                            <artifactId>spring-cloud-function-dependencies</artifactId>
-                                            <version>${spring-cloud-function.version}</version>
-                                        </dependency>
+
                                         <dependency>
                                             <groupId>com.wavefront</groupId>
                                             <artifactId>wavefront-spring-boot-bom</artifactId>
diff --git a/functions/spring-functions-parent/pom.xml b/functions/spring-functions-parent/pom.xml
index ee8826f8..aca6662d 100644
--- a/functions/spring-functions-parent/pom.xml
+++ b/functions/spring-functions-parent/pom.xml
@@ -15,7 +15,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<spring-cloud-function.version>3.1.4</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.5-SNAPSHOT</spring-cloud-function.version>
 		<spring-cloud-fn.version>${project.version}</spring-cloud-fn.version>
 	</properties>
 
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 6cdcd042..73e23e5f 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -43,7 +43,7 @@
 		<spring-boot.version>2.5.5</spring-boot.version>
 		<spring-kafka.version>2.7.1</spring-kafka.version>
 		<spring-rabbit.version>2.3.7</spring-rabbit.version>
-		<spring-cloud-function.version>3.1.4</spring-cloud-function.version>
+		<spring-cloud-function.version>3.1.5-SNAPSHOT</spring-cloud-function.version>
 		<spring-data-geode-test.version>0.0.21.RELEASE</spring-data-geode-test.version>
 		<test-containers.version>1.15.2</test-containers.version>
 		<maven-flatten-plugin.version>1.2.5</maven-flatten-plugin.version>