From d471d27628ff3052c8258cd2a3f88257d327fb6f Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Thu, 26 May 2022 22:59:12 -0500
Subject: [PATCH] GH-279: Update to Spring Cloud 2021.0.3

Fixes #279

* Updates version numbers as per [2021.0.3 release notes](https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2021.0-Release-Notes#202103)
* Also factors out common version props to stream-applications-build/pom.xml
---
 applications/stream-applications-core/pom.xml | 7 +------
 functions/spring-functions-parent/pom.xml     | 4 ----
 stream-applications-build/pom.xml             | 7 +++++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml
index b90ffe0e..e14801d1 100644
--- a/applications/stream-applications-core/pom.xml
+++ b/applications/stream-applications-core/pom.xml
@@ -20,17 +20,13 @@
         <stream-apps-core.version>${revision}</stream-apps-core.version>
         <java-functions.version>1.2.1-SNAPSHOT</java-functions.version>
         <apps.base-image>springcloud/baseimage:1.0.1</apps.base-image>
-        <spring-cloud-stream-dependencies.version>3.2.3</spring-cloud-stream-dependencies.version>
-        <spring-cloud-stream.version>3.2.3</spring-cloud-stream.version>
         <spring-cloud-dataflow-apps-generator-plugin.version>1.0.7-SNAPSHOT</spring-cloud-dataflow-apps-generator-plugin.version>
         <spring-cloud-dataflow-apps-docs-plugin.version>1.0.7-SNAPSHOT</spring-cloud-dataflow-apps-docs-plugin.version>
         <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.7-SNAPSHOT</spring-cloud-dataflow-apps-metadata-plugin.version>
         <java-cfenv-boot.version>2.4.0</java-cfenv-boot.version>
         <prometheus-rsocket.version>1.4.0</prometheus-rsocket.version>
         <wavefront-spring-boot.version>2.2.2</wavefront-spring-boot.version>
-        <spring-cloud.version>2021.0.2</spring-cloud.version>
-        <spring-cloud-starters.version>3.1.2</spring-cloud-starters.version>
-	</properties>
+    </properties>
 
     <modules>
         <module>stream-applications-test-support</module>
@@ -363,4 +359,3 @@
     </pluginRepositories>
 
 </project>
-
diff --git a/functions/spring-functions-parent/pom.xml b/functions/spring-functions-parent/pom.xml
index ad3f2761..158861f2 100644
--- a/functions/spring-functions-parent/pom.xml
+++ b/functions/spring-functions-parent/pom.xml
@@ -13,10 +13,6 @@
 	<artifactId>spring-functions-parent</artifactId>
 	<packaging>pom</packaging>
 
-	<properties>
-		<spring-cloud-function.version>3.2.3</spring-cloud-function.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml
index 373d8992..4f7c4099 100644
--- a/stream-applications-build/pom.xml
+++ b/stream-applications-build/pom.xml
@@ -43,9 +43,12 @@
 		<spring-boot.version>2.6.8</spring-boot.version>
 		<spring-kafka.version>2.8.6</spring-kafka.version>
 		<spring-rabbit.version>2.4.5</spring-rabbit.version>
-		<spring-cloud-function.version>3.2.3</spring-cloud-function.version>
-		<spring-cloud-starters.version>3.1.2</spring-cloud-starters.version>
 		<spring-geode.version>1.6.7</spring-geode.version>
+		<spring-cloud.version>2021.0.3</spring-cloud.version>
+		<spring-cloud-starters.version>3.1.3</spring-cloud-starters.version>
+		<spring-cloud-function.version>3.2.5</spring-cloud-function.version>
+		<spring-cloud-stream-dependencies.version>3.2.4</spring-cloud-stream-dependencies.version>
+		<spring-cloud-stream.version>3.2.4</spring-cloud-stream.version>
 		<test-containers.version>1.16.3</test-containers.version>
 		<maven-flatten-plugin.version>1.2.5</maven-flatten-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>