diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
index 7ccf2fb2..aa424cc5 100644
--- a/gradle/dependency-management.gradle
+++ b/gradle/dependency-management.gradle
@@ -23,7 +23,7 @@ dependencyManagement {
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
 		dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE'
 		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
-		dependency 'javax.servlet:javax.servlet-api:4.0.1'
+        dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 		dependency 'junit:junit:4.13.2'
 		dependency 'mysql:mysql-connector-java:8.0.27'
 		dependency 'org.apache.derby:derby:10.14.2.0'
diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle
index d9a1b596..3939fda7 100644
--- a/spring-session-core/spring-session-core.gradle
+++ b/spring-session-core/spring-session-core.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 	optional "io.projectreactor:reactor-core"
 	optional "jakarta.annotation:jakarta.annotation-api"
-	optional "javax.servlet:javax.servlet-api"
+	optional "jakarta.servlet:jakarta.servlet-api"
 	optional "org.springframework:spring-context"
 	optional "org.springframework:spring-jdbc"
 	optional "org.springframework:spring-messaging"
diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle
index 83ea1273..49fc7738 100644
--- a/spring-session-data-redis/spring-session-data-redis.gradle
+++ b/spring-session-data-redis/spring-session-data-redis.gradle
@@ -12,7 +12,7 @@ dependencies {
 	optional "org.springframework:spring-web"
 
 	testCompile "io.projectreactor:reactor-test"
-	testCompile "javax.servlet:javax.servlet-api"
+	testCompile "jakarta.servlet:jakarta.servlet-api"
 	testCompile "org.springframework:spring-web"
 	testCompile "org.springframework.security:spring-security-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle
index 355ed426..064a62ec 100644
--- a/spring-session-docs/spring-session-docs.gradle
+++ b/spring-session-docs/spring-session-docs.gradle
@@ -18,7 +18,7 @@ dependencies {
 	testCompile 'org.assertj:assertj-core'
 	testCompile 'com.hazelcast:hazelcast'
 	testCompile 'io.lettuce:lettuce-core'
-	testCompile 'javax.servlet:javax.servlet-api'
+	testCompile 'jakarta.servlet:jakarta.servlet-api'
 	testCompile 'org.junit.jupiter:junit-jupiter-api'
 	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }
diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle
index 183d56b7..de52ec28 100644
--- a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle
+++ b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile "org.springframework:spring-context"
     compile "jakarta.annotation:jakarta.annotation-api"
 
-    testCompile "javax.servlet:javax.servlet-api"
+    testCompile "jakarta.servlet:jakarta.servlet-api"
     testCompile "org.springframework:spring-web"
     testCompile "org.junit.jupiter:junit-jupiter-api"
     testCompile "org.springframework.security:spring-security-core"
diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle
index d33d5802..84e20cb0 100644
--- a/spring-session-hazelcast/spring-session-hazelcast.gradle
+++ b/spring-session-hazelcast/spring-session-hazelcast.gradle
@@ -13,7 +13,7 @@ dependencies {
 	hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements'))
 	compileOnly(project(":hazelcast4"))
 
-	testCompile "javax.servlet:javax.servlet-api"
+	testCompile "jakarta.servlet:jakarta.servlet-api"
 	testCompile "org.springframework:spring-web"
 	testCompile "org.springframework.security:spring-security-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle
index 7cdfd8a0..a9ddec5f 100644
--- a/spring-session-jdbc/spring-session-jdbc.gradle
+++ b/spring-session-jdbc/spring-session-jdbc.gradle
@@ -7,7 +7,7 @@ dependencies {
 	compile "org.springframework:spring-context"
 	compile "org.springframework:spring-jdbc"
 
-	testCompile "javax.servlet:javax.servlet-api"
+	testCompile "jakarta.servlet:jakarta.servlet-api"
 	testCompile "org.springframework:spring-web"
 	testCompile "org.springframework.security:spring-security-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
index 9879e212..6929f73d 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -10,7 +10,7 @@ dependencies {
 	compile slf4jDependencies
 	compile "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
index 5acf9648..b0655a95 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -12,7 +12,7 @@ dependencies {
 	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testCompile "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
index f514ccd1..643f7962 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
@@ -9,7 +9,7 @@ dependencies {
 	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
index 9879e212..6929f73d 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
@@ -10,7 +10,7 @@ dependencies {
 	compile slf4jDependencies
 	compile "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
index a17526b9..80078cca 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
@@ -11,7 +11,7 @@ dependencies {
 	compile slf4jDependencies
 	compile "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.springframework.security:spring-security-test"
 	testCompile "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
index 7aee43e5..e4327a66 100644
--- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
+++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
@@ -12,7 +12,7 @@ dependencies {
 	compile slf4jDependencies
 	compile "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testCompile "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
index bebf5ab8..5228eb31 100644
--- a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
+++ b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -8,7 +8,7 @@ dependencies {
 	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
index 87abbf8d..a0d2b6a5 100644
--- a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
+++ b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
@@ -9,7 +9,7 @@ dependencies {
 	compile jstlDependencies
 	compile slf4jDependencies
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
 	testCompile "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
index 81a1b9d4..56dafd80 100644
--- a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
+++ b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
@@ -10,7 +10,7 @@ dependencies {
 	compile slf4jDependencies
 	compile "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testCompile "org.assertj:assertj-core"
     testCompile "org.junit.jupiter:junit-jupiter-api"