diff --git a/gradle.properties b/gradle.properties
index b112d78..908e9d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,19 +3,16 @@ antlrVersion=2.7.7
 apacheGeodeVersion=1.13.1
 apacheTaglibsStandardVersion=1.2.5
 findbugsVersion=3.0.2
-# Spring Boot 2.3 sets Apache Groovy version to 2.5.11
-# https://github.com/spring-projects/spring-boot/blob/v2.3.0.RELEASE/spring-boot-project/spring-boot-dependencies/build.gradle#L365
-#groovyVersion=2.4.19
 javaxServletJspJstlApiVersion=1.2.1
 multithreadedtcVersion=1.01
 # The Spring Boot & Spring Session version are the only required version properties.
 # The other Spring version properties are for overriding/testing purposes.
 springVersion=5.3.1
 springBootVersion=2.4.1-SNAPSHOT
+springDataBomVersion=2021.0.0-SNAPSHOT
 springDataCommonsVersion=2.5.0-SNAPSHOT
 springDataGeodeVersion=2.5.0-SNAPSHOT
 springDataGeodeTestVersion=0.0.21.RELEASE
-springDataBomVersion=2021.0.0-SNAPSHOT
 springSessionVersion=2.5.0-SNAPSHOT
 springSessionBomVersion=2021.0.0-SNAPSHOT
 springShellVersion=1.2.0.RELEASE
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index 2cd0e44..d890729 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -3,6 +3,7 @@ dependencyManagement {
 		mavenBom "org.springframework:spring-framework-bom:${springVersion}"
 		mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion"
 		mavenBom "org.springframework.data:spring-data-bom:${springDataBomVersion}"
+		mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"
 	}
 	dependencies {
 		dependency "antlr:antlr:$antlrVersion"