diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml
index c1e7a182e401..fb9168b4a2fe 100644
--- a/logging-modules/log-mdc/pom.xml
+++ b/logging-modules/log-mdc/pom.xml
@@ -27,9 +27,9 @@
             <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -97,7 +97,8 @@
         <disruptor.version>3.3.6</disruptor.version>
         <jbosslogging.version>3.3.0.Final</jbosslogging.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-        <spring.version>5.3.28</spring.version>
+        <spring.version>6.0.11</spring.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
index 5e52c5f25ede..acc27ca3c2f3 100644
--- a/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
+++ b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java
@@ -4,14 +4,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @EnableWebMvc
 @ComponentScan(basePackages = "com.baeldung")
-public class AppConfiguration extends WebMvcConfigurerAdapter {
+public class AppConfiguration implements WebMvcConfigurer {
 
-    @Override
     public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
         configurer.enable();
     }
diff --git a/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
index 828c2b2efa79..ea66774437eb 100644
--- a/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
+++ b/logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java
@@ -1,7 +1,7 @@
 package com.baeldung.config;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;