diff -Nru avro-1.7.6/lang/java/ipc/pom.xml avro-1.7.6.jetty/lang/java/ipc/pom.xml
--- avro-1.7.6/lang/java/ipc/pom.xml	2014-01-10 21:57:53.000000000 +0100
+++ avro-1.7.6.jetty/lang/java/ipc/pom.xml	2016-08-01 19:01:43.467745583 +0200
@@ -125,15 +125,21 @@
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
@@ -142,8 +148,8 @@
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
       <version>${jetty-servlet-api.version}</version>
     </dependency>
 
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/HttpServer.java avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/HttpServer.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/HttpServer.java	2011-02-24 18:56:08.000000000 +0100
+++ avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/HttpServer.java	2016-08-01 19:01:43.467745583 +0200
@@ -22,14 +22,13 @@
 
 import org.apache.avro.AvroRuntimeException;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 /** An HTTP-based RPC {@link Server}. */
 public class HttpServer implements Server {
-  private org.mortbay.jetty.Server server;
+  private org.eclipse.jetty.server.Server server;
 
   /** Constructs a server to run on the named port. */
   public HttpServer(Responder responder, int port) throws IOException {
@@ -48,38 +47,41 @@
 
   /** Constructs a server to run on the named port on the specified address. */
   public HttpServer(ResponderServlet servlet, String bindAddress, int port) throws IOException {
-    this.server = new org.mortbay.jetty.Server();
-    SelectChannelConnector connector = new SelectChannelConnector();
-    connector.setLowResourceMaxIdleTime(10000);
+    this.server = new org.eclipse.jetty.server.Server();
+    ServerConnector connector = new ServerConnector(server);
+    connector.setSoLingerTime(10000);
     connector.setAcceptQueueSize(128);
-    connector.setResolveNames(false);
-    connector.setUseDirectBuffers(false);
+    connector.setReuseAddress(false);
+    connector.setInheritChannel(false);
     if (bindAddress != null) {
       connector.setHost(bindAddress);
     }
     connector.setPort(port);
     server.addConnector(connector);
-    new Context(server, "/").addServlet(new ServletHolder(servlet), "/*");
+    new ServletContextHandler(server, "/").addServlet(new ServletHolder(servlet), "/*");
   }
 
   /** Constructs a server to run with the given connector. */
-  public HttpServer(Responder responder, Connector connector) throws IOException {
+  public HttpServer(Responder responder, ServerConnector connector) throws IOException {
     this(new ResponderServlet(responder), connector);
   }
 
   /** Constructs a server to run with the given connector. */
-  public HttpServer(ResponderServlet servlet, Connector connector) throws IOException {
-    this.server = new org.mortbay.jetty.Server();
+  public HttpServer(ResponderServlet servlet, ServerConnector connector) throws IOException {
+    this.server = new org.eclipse.jetty.server.Server();
     server.addConnector(connector);
-    new Context(server, "/").addServlet(new ServletHolder(servlet), "/*");
+    new ServletContextHandler(server, "/").addServlet(new ServletHolder(servlet), "/*");
   }
 
-  public void addConnector(Connector connector) {
+  public void addConnector(ServerConnector connector) {
     server.addConnector(connector);
   }
 
   @Override
-  public int getPort() { return server.getConnectors()[0].getLocalPort(); }
+  public int getPort() {
+    ServerConnector connector = new ServerConnector(server);
+    return connector.getLocalPort();
+  }
 
   @Override
   public void close() {
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2010-08-23 08:57:37.000000000 +0200
+++ avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2016-08-01 19:01:43.467745583 +0200
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.resource.Resource;
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.util.resource.Resource;
 
 /**
  * Very simple servlet class capable of serving static files.
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServer.java avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServer.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServer.java	2010-07-28 21:28:53.000000000 +0200
+++ avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServer.java	2016-08-01 19:01:43.467745583 +0200
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 /* This is a server that displays live information from a StatsPlugin.
  * 
@@ -38,10 +38,10 @@
     this.httpServer = new Server(port);
     this.plugin = plugin;
     
-    Context staticContext = new Context(httpServer, "/static");
+    ServletContextHandler staticContext = new ServletContextHandler(httpServer, "/static");
     staticContext.addServlet(new ServletHolder(new StaticServlet()), "/");
     
-    Context context = new Context(httpServer, "/");
+    ServletContextHandler context = new ServletContextHandler(httpServer, "/");
     context.addServlet(new ServletHolder(new StatsServlet(plugin)), "/");
     
     httpServer.start();
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2010-08-23 08:57:37.000000000 +0200
+++ avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2016-08-01 19:01:43.468745536 +0200
@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.resource.Resource;
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.util.resource.Resource;
 
 /**
  * Very simple servlet class capable of serving static files.
diff -Nru avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java
--- avro-1.7.6/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java	2011-10-12 01:25:04.000000000 +0200
+++ avro-1.7.6.jetty/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/TracePlugin.java	2016-08-01 19:01:43.468745536 +0200
@@ -35,10 +35,10 @@
 import org.apache.avro.ipc.RPCContext;
 import org.apache.avro.ipc.RPCPlugin;
 import org.apache.avro.ipc.specific.SpecificResponder;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -342,17 +342,17 @@
    */
   protected void initializeClientServer() {
     clientFacingServer = new Server();
-    Context staticContext = new Context(clientFacingServer, "/static");
+    ServletContextHandler staticContext = new ServletContextHandler(clientFacingServer, "/static");
     staticContext.addServlet(new ServletHolder(new StaticServlet()), "/");
-    Context context = new Context(clientFacingServer, "/");
+    ServletContextHandler context = new ServletContextHandler(clientFacingServer, "/");
     context.addServlet(new ServletHolder(new TraceClientServlet()), "/");
     boolean connected = false;
-    SocketConnector socket = null;
+    ServerConnector socket = null;
     
     // Keep trying ports until we can connect
     while (!connected) {
       try {
-        socket = new SocketConnector();
+        socket = new ServerConnector(clientFacingServer);
         socket.setPort(clientPort);
         clientFacingServer.addConnector(socket);
         clientFacingServer.start();