diff --git a/pom.xml b/pom.xml
index e92e31b..7618c01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>alerttek</groupId>
 	<artifactId>CommEngine</artifactId>
-	<version>1.0.34-SNAPSHOT</version>
+	<version>tomcat11-1.0.34-SNAPSHOT</version>
 	<properties>
 		<maven.test.skip>true</maven.test.skip>
 	</properties>
@@ -58,12 +58,19 @@
 			<version>4.5.8</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
+		<!-- 
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 			<version>4.0.1</version>
 			<scope>provided</scope>
 		</dependency>
+		-->
+		<dependency>
+		    <groupId>jakarta.servlet</groupId>
+		    <artifactId>jakarta.servlet-api</artifactId>
+		    <version>6.0.0</version> <scope>provided</scope>
+		</dependency>
 		<dependency>
     		<groupId>com.googlecode.json-simple</groupId>
     		<artifactId>json-simple</artifactId>
diff --git a/src/main/java/altk/comm/engine/Broadcast.java b/src/main/java/altk/comm/engine/Broadcast.java
index 4924675..c4ad3e4 100644
--- a/src/main/java/altk/comm/engine/Broadcast.java
+++ b/src/main/java/altk/comm/engine/Broadcast.java
@@ -10,7 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Vector;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledExecutorService;
@@ -18,9 +17,6 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.json.simple.JSONObject;
 
@@ -33,6 +29,8 @@ import altk.comm.engine.exception.BroadcastException;
 import altk.comm.engine.exception.EngineException;
 import altk.comm.engine.exception.PlatformError;
 import altk.comm.engine.exception.PlatformException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Broadcast class absorbs what was formerly known as Dispatcher class.
diff --git a/src/main/java/altk/comm/engine/CommEngine.java b/src/main/java/altk/comm/engine/CommEngine.java
index f6c9a99..313868b 100644
--- a/src/main/java/altk/comm/engine/CommEngine.java
+++ b/src/main/java/altk/comm/engine/CommEngine.java
@@ -5,8 +5,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -17,12 +15,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.json.simple.JSONObject;
@@ -30,6 +22,11 @@ import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
 import altk.comm.engine.Broadcast.BroadcastState;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
 public abstract class CommEngine extends HttpServlet
diff --git a/src/main/java/altk/comm/engine/XMLDOMBroadcast.java b/src/main/java/altk/comm/engine/XMLDOMBroadcast.java
index 0806a73..1fbba73 100644
--- a/src/main/java/altk/comm/engine/XMLDOMBroadcast.java
+++ b/src/main/java/altk/comm/engine/XMLDOMBroadcast.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.Vector;
 import java.util.zip.ZipInputStream;
 
-import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
@@ -33,6 +33,7 @@ import altk.comm.engine.exception.PlatformError;
 import altk.comm.engine.exception.PlatformException;
 import altk.common.engine.util.LoggingInputStreamReader;
 import altk.common.engine.util.UTF8BenevolentDecoder;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Abstract class extending Broadcast by providing an implementation of the decode
diff --git a/src/main/java/altk/comm/engine/XMLSAXBroadcast.java b/src/main/java/altk/comm/engine/XMLSAXBroadcast.java
index ca78c8b..9d56f1f 100644
--- a/src/main/java/altk/comm/engine/XMLSAXBroadcast.java
+++ b/src/main/java/altk/comm/engine/XMLSAXBroadcast.java
@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.ZipInputStream;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -20,6 +19,7 @@ import altk.comm.engine.exception.BroadcastMsgException;
 import altk.comm.engine.exception.EngineException;
 import altk.common.engine.util.LoggingInputStreamReader;
 import altk.common.engine.util.UTF8BenevolentDecoder;
+import jakarta.servlet.http.HttpServletRequest;
 
 public abstract class XMLSAXBroadcast extends Broadcast
 {