From 91dbbd4cea6622d2c6a0e349fea45554269f0022 Mon Sep 17 00:00:00 2001
From: Corneil du Plessis <pcorneil@vmware.com>
Date: Tue, 19 Dec 2023 11:44:36 +0200
Subject: [PATCH] Updated Spring cloud version and documentation. Fixes #5611

---
 .../pom.xml                                         |  2 +-
 .../src/main/asciidoc/appendix-building.adoc        | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
index b2b778051d..37aa21b553 100644
--- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
+++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml
@@ -21,7 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- Keep spring boot version in sync between spring-cloud-dataflow-build and spring-boot-dependencies (parent and properties) -->
 		<spring-boot.version>2.7.18</spring-boot.version>
-		<spring-cloud.version>2021.0.8</spring-cloud.version>
+		<spring-cloud.version>2021.0.9</spring-cloud.version>
 		<spring-shell.version>2.1.13</spring-shell.version>
 		<commons-io.version>2.7</commons-io.version>
 		<commons-text.version>1.10.0</commons-text.version>
diff --git a/spring-cloud-skipper/spring-cloud-skipper-docs/src/main/asciidoc/appendix-building.adoc b/spring-cloud-skipper/spring-cloud-skipper-docs/src/main/asciidoc/appendix-building.adoc
index 4988361f6b..147743cb08 100644
--- a/spring-cloud-skipper/spring-cloud-skipper-docs/src/main/asciidoc/appendix-building.adoc
+++ b/spring-cloud-skipper/spring-cloud-skipper-docs/src/main/asciidoc/appendix-building.adoc
@@ -96,7 +96,7 @@ Working build file for _Maven_ would look like something shown below:
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.9.RELEASE</version>
+		<version>2.7.18</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -104,12 +104,11 @@ Working build file for _Maven_ would look like something shown below:
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Dalston.SR5</spring-cloud.version>
+		<spring-cloud.version>2021.9</spring-cloud.version>
 		<spring-cloud-skipper.version>{project-version}</spring-cloud-skipper.version>
 		<!--
-			reactor and flyway are managed by boot so only clean way with maven is to
-			change version properties. trying to import boms in dependencyManagement
-			would not actually change versions.
+			reactor and flyway are managed by boot so this is an illustration of how to modify the versions since
+            trying to import boms in dependencyManagement would not actually change versions.
 		-->
 		<reactor.version>3.0.7.RELEASE</reactor.version>
 		<flyway.version>5.0.5</flyway.version>
@@ -164,7 +163,7 @@ Working build file for _Gradle_ would look like something shown below:
 ----
 buildscript {
 	ext {
-		springBootVersion = '1.5.9.RELEASE'
+		springBootVersion = '2.7.18'
 	}
 	repositories {
 		mavenCentral()
@@ -192,7 +191,7 @@ repositories {
 
 
 ext {
-	springCloudVersion = 'Dalston.SR5'
+	springCloudVersion = '2021.9'
 	springCloudSkipperVersion = '{project-version}'
 	reactorVersion = 'Aluminium-SR3'
 	reactorNettyVersion = '0.6.6.RELEASE'