diff --git a/pom.xml b/pom.xml
index c2973a08c..21c0652b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@ under the License.
     <slf4j.version>2.0.17</slf4j.version>
     <findsecbugs.version>1.14.0</findsecbugs.version>
     <commons.osgi.import>
-      javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional,
+      jakarta.servlet;version="[4.0.2, 7.0.0)";resolution:=optional,
       org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional,
       org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional,
       org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional,
@@ -173,6 +173,17 @@ under the License.
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.github.siom79.japicmp</groupId>
+		<artifactId>japicmp-maven-plugin</artifactId>
+		<configuration>
+		  <parameter>
+            <excludes>
+              <exclude>org.apache.commons.logging.impl.ServletContextCleaner</exclude>
+	        </excludes>
+          </parameter>
+		</configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -274,7 +285,7 @@ under the License.
                 <log4j12>${org.apache.logging.log4j:log4j-1.2-api:jar}</log4j12>
                 <log4j-api>${org.apache.logging.log4j:log4j-api:jar}</log4j-api>
                 <logkit>${logkit:logkit:jar}</logkit>
-                <servlet-api>${javax.servlet:javax.servlet-api:jar}</servlet-api>
+                <servlet-api>${jakarta.servlet:jakarta.servlet-api:jar}</servlet-api>
                 <commons-logging>target/${project.build.finalName}.jar</commons-logging>
                 <commons-logging-api>target/${project.build.finalName}-api.jar</commons-logging-api>
                 <commons-logging-adapters>target/${project.build.finalName}-adapters.jar</commons-logging-adapters>
@@ -572,9 +583,9 @@ under the License.
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.1.0</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -810,3 +821,4 @@ under the License.
     </contributor>
   </contributors>
 </project>
+
diff --git a/src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java b/src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java
index 701f7eae0..83d393fd8 100644
--- a/src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java
+++ b/src/main/java/org/apache/commons/logging/impl/ServletContextCleaner.java
@@ -20,8 +20,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 import org.apache.commons.logging.LogFactory;
 
@@ -143,3 +143,4 @@ public void contextInitialized(final ServletContextEvent sce) {
         // do nothing
     }
 }
+