diff --git a/lang/java/ipc-jetty/pom.xml b/lang/java/ipc-jetty/pom.xml
index fdc2a258bdc..cdef006bc8a 100644
--- a/lang/java/ipc-jetty/pom.xml
+++ b/lang/java/ipc-jetty/pom.xml
@@ -106,8 +106,8 @@
       <artifactId>jetty-server</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
+      <groupId>org.eclipse.jetty.${jetty.ee.version}</groupId>
+      <artifactId>jetty-${jetty.ee.version}-servlet</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/HttpServer.java b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/HttpServer.java
index 7fe71e16ba8..5bd1f6cdf23 100644
--- a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/HttpServer.java
+++ b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/HttpServer.java
@@ -31,9 +31,9 @@
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 
 /** An HTTP-based RPC {@link Server}. */
 public class HttpServer implements Server {
@@ -104,7 +104,9 @@ public HttpServer(ResponderServlet servlet, ConnectionFactory connectionFactory,
 
     server.addConnector(connector);
     ServletHandler handler = new ServletHandler();
-    server.setHandler(handler);
+    ServletContextHandler sch = new ServletContextHandler();
+    sch.setServletHandler(handler);
+    server.setHandler(sch);
     handler.addServletWithMapping(new ServletHolder(servlet), "/*");
   }
 
@@ -120,7 +122,9 @@ public HttpServer(ResponderServlet servlet, Connector connector) throws IOExcept
       server.addConnector(connector);
     }
     ServletHandler handler = new ServletHandler();
-    server.setHandler(handler);
+    ServletContextHandler sch = new ServletContextHandler();
+    sch.setServletHandler(handler);
+    server.setHandler(sch);
     handler.addServletWithMapping(new ServletHolder(servlet), "/*");
   }
 
@@ -154,7 +158,7 @@ public void close() {
 
   /**
    * Start the server.
-   * 
+   *
    * @throws AvroRuntimeException if the underlying Jetty server throws any
    *                              exception while starting.
    */
diff --git a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StaticServlet.java b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StaticServlet.java
index 2e28ba14eba..162f00d0c1a 100644
--- a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StaticServlet.java
+++ b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StaticServlet.java
@@ -20,8 +20,9 @@
 
 import java.net.URL;
 
-import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.DefaultServlet;
 import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.URLResourceFactory;
 
 /**
  * Very simple servlet class capable of serving static files.
@@ -29,7 +30,6 @@
 public class StaticServlet extends DefaultServlet {
   private static final long serialVersionUID = 1L;
 
-  @Override
   public Resource getResource(String pathInContext) {
     // Take only last slice of the URL as a filename, so we can adjust path.
     // This also prevents mischief like '../../foo.css'
@@ -40,6 +40,6 @@ public Resource getResource(String pathInContext) {
     if (resource == null) {
       return null;
     }
-    return Resource.newResource(resource);
+    return new URLResourceFactory().newResource(resource);
   }
 }
diff --git a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java
index 43e066190d7..4feb71f7b06 100644
--- a/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java
+++ b/lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 
 /* This is a server that displays live information from a StatsPlugin.
  *
diff --git a/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestProtocolHttps.java b/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestProtocolHttps.java
index 57aae423c26..78c8a68c3e8 100644
--- a/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestProtocolHttps.java
+++ b/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestProtocolHttps.java
@@ -37,7 +37,7 @@ public Server createServer(Responder testResponder) throws Exception {
     System.setProperty("javax.net.ssl.trustStore", "src/test/truststore");
     System.setProperty("javax.net.ssl.trustStorePassword", "avrotest");
     SslConnectionFactory connectionFactory = new SslConnectionFactory("HTTP/1.1");
-    SslContextFactory sslContextFactory = connectionFactory.getSslContextFactory();
+    SslContextFactory.Server sslContextFactory = connectionFactory.getSslContextFactory();
 
     sslContextFactory.setKeyStorePath(System.getProperty("javax.net.ssl.keyStore"));
     sslContextFactory.setKeyManagerPassword(System.getProperty("javax.net.ssl.password"));
diff --git a/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestStatsPluginAndServlet.java b/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestStatsPluginAndServlet.java
index 33563f96dce..e9f7a90f5ee 100644
--- a/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestStatsPluginAndServlet.java
+++ b/lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestStatsPluginAndServlet.java
@@ -26,7 +26,7 @@
 import java.nio.ByteBuffer;
 import java.util.Random;
 
-import javax.servlet.UnavailableException;
+import jakarta.servlet.UnavailableException;
 
 import org.apache.avro.AvroRemoteException;
 import org.apache.avro.Protocol;
@@ -164,11 +164,11 @@ public Object respond(Message message, Object request) throws AvroRemoteExceptio
   /**
    * Demo program for using RPC stats. This automatically generates client RPC
    * requests. Alternatively a can be used (as below) to trigger RPCs.
-   * 
+   *
    * <pre>
    * java -jar build/avro-tools-*.jar rpcsend '{"protocol":"sleepy","namespace":null,"types":[],"messages":{"sleep":{"request":[{"name":"millis","type":"long"}],"response":"null"}}}' sleep localhost 7002 '{"millis": 20000}'
    * </pre>
-   * 
+   *
    * @param args
    * @throws Exception
    */
diff --git a/lang/java/ipc/pom.xml b/lang/java/ipc/pom.xml
index 6f5fb359df9..1937e327855 100644
--- a/lang/java/ipc/pom.xml
+++ b/lang/java/ipc/pom.xml
@@ -169,8 +169,8 @@
       <artifactId>velocity-engine-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
         <scope>provided</scope>
     </dependency>
     <!-- javax.annotation-api dependency must be explicit for forward compatibility (Java > 9) -->
diff --git a/lang/java/ipc/src/main/java/org/apache/avro/ipc/ResponderServlet.java b/lang/java/ipc/src/main/java/org/apache/avro/ipc/ResponderServlet.java
index a2fe5fa486c..c36ee9bae47 100644
--- a/lang/java/ipc/src/main/java/org/apache/avro/ipc/ResponderServlet.java
+++ b/lang/java/ipc/src/main/java/org/apache/avro/ipc/ResponderServlet.java
@@ -22,10 +22,10 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.avro.AvroRuntimeException;
 
diff --git a/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServlet.java b/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServlet.java
index 38c0bb2fe03..e40a3c03ad9 100644
--- a/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServlet.java
+++ b/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServlet.java
@@ -28,11 +28,11 @@
 import java.util.Set;
 import java.util.Map.Entry;
 
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.UnavailableException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 1530330b8a3..9438f13b32e 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -46,7 +46,8 @@
     <hadoop.version>3.4.2</hadoop.version>
     <hamcrest.version>3.0</hamcrest.version>
     <jackson-bom.version>2.20.0</jackson-bom.version>
-    <jetty.version>9.4.58.v20250814</jetty.version>
+    <jetty.version>12.1.0</jetty.version>
+    <jetty.ee.version>ee10</jetty.ee.version>
     <jopt-simple.version>5.0.4</jopt-simple.version>
     <junit5.version>5.14.0</junit5.version>
     <maven-core.version>3.9.6</maven-core.version>
@@ -54,7 +55,7 @@
     <netty.version>4.2.7.Final</netty.version>
     <protobuf.version>4.33.0</protobuf.version>
     <reload4j.version>1.2.26</reload4j.version>
-    <servlet-api.version>4.0.1</servlet-api.version>
+    <servlet-api.version>6.0.0</servlet-api.version>
     <slf4j.version>2.0.17</slf4j.version>
     <snappy.version>1.1.10.8</snappy.version>
     <thrift.version>0.20.0</thrift.version>
@@ -549,8 +550,8 @@
         <version>${jetty.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
+        <groupId>org.eclipse.jetty.${jetty.ee.version}</groupId>
+        <artifactId>jetty-${jetty.ee.version}-servlet</artifactId>
         <version>${jetty.version}</version>
       </dependency>
       <dependency>
@@ -559,8 +560,8 @@
         <version>${jetty.version}</version>
       </dependency>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
         <version>${servlet-api.version}</version>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index 33ba8259860..1d067ac121a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
             <configuration>
               <rules>
                 <enforceBytecodeVersion>
-                  <maxJdkVersion>11</maxJdkVersion>
+                  <maxJdkVersion>17</maxJdkVersion>
                   <ignoredScopes>
                     <ignoredScope>test</ignoredScope>
                     <ignoredScope>provided</ignoredScope>