From 695e58f418b46bc9e28a8c6bd88a641d874921ec Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Tue, 2 May 2023 08:59:58 +0100
Subject: [PATCH] Align buildSrc's Framework version with the main build's
 version

Closes gh-35224
---
 buildSrc/build.gradle                                     | 3 ++-
 gradle.properties                                         | 1 +
 spring-boot-project/spring-boot-dependencies/build.gradle | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index bca461aed16..a313abb6197 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -18,13 +18,14 @@ ext {
 		def properties = new Properties()
 		properties.load(it)
 		set("kotlinVersion", properties["kotlinVersion"])
+		set("springFrameworkVersion", properties["springFrameworkVersion"])
 	}
 }
 
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 
-	implementation(platform("org.springframework:spring-framework-bom:5.3.15"))
+	implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
 	implementation("com.fasterxml.jackson.core:jackson-databind:2.11.4")
 	implementation("com.gradle:gradle-enterprise-gradle-plugin:3.12.1")
 	implementation("com.tngtech.archunit:archunit:1.0.0")
diff --git a/gradle.properties b/gradle.properties
index 8cf2e99d168..284895299a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
 kotlinVersion=1.6.21
+springFrameworkVersion=5.3.27
 tomcatVersion=9.0.74
 
 kotlin.stdlib.default.dependency=false
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index b3ff6d72a25..1a4f357f51a 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1750,7 +1750,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Framework", "5.3.27") {
+	library("Spring Framework", "${springFrameworkVersion}") {
 		prohibit {
 			versionRange "[6.0.0-M1,)"
 			because "we upgrade in Spring Boot 3.x"