diff --git a/docs/spring-session-docs.gradle b/docs/spring-session-docs.gradle
index c2d9a07..29ad9b9 100644
--- a/docs/spring-session-docs.gradle
+++ b/docs/spring-session-docs.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
 
 	testCompile project(':spring-session-data-geode')
-	testCompile "javax.servlet:javax.servlet-api"
+	testCompile "jakarta.servlet:jakarta.servlet-api"
 	testCompile "junit:junit"
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.mockito:mockito-core"
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index d41c6b2..29b59ee 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -23,8 +23,8 @@ dependencyManagement {
 //		mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"
 	}
 	dependencies {
-		dependency "javax.servlet:javax.servlet-api:$javaxServletApiVersion"
-		dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
+		dependency "jakarta.servlet:jakarta.servlet-api:$javaxServletApiVersion"
+		dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
 		dependency "antlr:antlr:$antlrVersion"
 		dependency "ch.qos.logback:logback-classic:$logbackVersion"
 		dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"
diff --git a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
index 0211c45..dec9f6f 100644
--- a/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
+++ b/samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
@@ -25,10 +25,11 @@ dependencies {
 	compile "org.springframework.data:spring-data-geode-test"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
-	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
+	providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+	providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
 
 	runtime "org.springframework.shell:spring-shell"
 
diff --git a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
index 98a38b0..3f29579 100644
--- a/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
+++ b/samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
@@ -22,10 +22,11 @@ dependencies {
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
-	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
+	providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+	providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
 
 	runtime "org.springframework.shell:spring-shell"
 
diff --git a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
index 029fb14..542274e 100644
--- a/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
+++ b/samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
@@ -9,10 +9,11 @@ dependencies {
 	compile "org.springframework.data:spring-data-geode-test"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
-	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
+	providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+	providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
 
 	runtime "org.springframework.shell:spring-shell"
 
diff --git a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
index 2b20144..e16aed4 100644
--- a/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
+++ b/samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
@@ -6,10 +6,11 @@ dependencies {
 	compile "org.springframework:spring-web"
 	compile "org.webjars:bootstrap"
 	compile "org.webjars:webjars-taglib"
-	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
+	providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
+	providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
 
 	runtime "org.springframework.shell:spring-shell"
 
diff --git a/spring-session-data-geode/spring-session-data-geode.gradle b/spring-session-data-geode/spring-session-data-geode.gradle
index bf11b16..9cd917c 100644
--- a/spring-session-data-geode/spring-session-data-geode.gradle
+++ b/spring-session-data-geode/spring-session-data-geode.gradle
@@ -20,7 +20,7 @@ dependencies {
 	optional "org.springframework.security:spring-security-core"
 	optional "org.springframework.security:spring-security-web"
 
-	provided "javax.servlet:javax.servlet-api"
+	provided "jakarta.servlet:jakarta.servlet-api"
 
 	// TODO: Remove dependency declarations when all internal Apache Geode API usage is removed; Only required by tests!
 	provided "org.apache.geode:geode-logging:$apacheGeodeVersion"