diff --git a/lib/deps.json b/lib/deps.json
index 85a75c6..7893c35 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -59,17 +59,20 @@
       "jersey-server",
       "jersey-common",
       "jersey-test-framework-core",
-      "jersey-test-framework-grizzly2",
+      "jersey-test-framework-jetty",
+      "jersey-container-jetty-http",
+      "jetty-continuation",
+      "jetty-http",
+      "jetty-server",
+      "jetty-io",
+      "jetty-util",
+      "javax.servlet-api",
       "jersey-guava",
       "hk2-api",
       "hk2-locator",
       "hk2-utils",
       "javax.inject",
       "hk2-osgi-resource-locator",
-      "jersey-container-grizzly2-http",
-      "grizzly-http-server",
-      "grizzly-framework",
-      "grizzly-http",
       "javax.annotation-api",
       "validation-api",
       "//core/common:onos-core-common",
@@ -115,9 +118,7 @@
     "easymock": "mvn:org.easymock:easymock:3.4",
     "error_prone_annotations": "mvn:com.google.errorprone:error_prone_annotations:2.0.2",
     "ganymed-ssh2": "mvn:ch.ethz.ganymed:ganymed-ssh2:262",
-    "grizzly-framework": "mvn:org.glassfish.grizzly:grizzly-framework:2.3.23",
-    "grizzly-http": "mvn:org.glassfish.grizzly:grizzly-http:2.3.23",
-    "grizzly-http-server": "mvn:org.glassfish.grizzly:grizzly-http-server:2.3.23",
+    "jersey-container-jetty-http": "mvn:org.glassfish.jersey.containers:jersey-container-jetty-http:2.22.2",
     "guava": "mvn:com.google.guava:guava:19.0",
     "guava-testlib": "mvn:com.google.guava:guava-testlib:19.0",
     "hamcrest-all": "mvn:org.hamcrest:hamcrest-all:1.3",
@@ -138,14 +139,19 @@
     "javax.ws.rs-api": "mvn:javax.ws.rs:javax.ws.rs-api:2.0.1",
     "jersey-client": "mvn:org.glassfish.jersey.core:jersey-client:2.22.2",
     "jersey-common": "mvn:org.glassfish.jersey.core:jersey-common:2.22.2",
-    "jersey-container-grizzly2-http": "mvn:org.glassfish.jersey.containers:jersey-container-grizzly2-http:2.22.2",
     "jersey-guava": "mvn:org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2",
     "jersey-media-multipart": "mvn:org.glassfish.jersey.media:jersey-media-multipart:2.22.2",
     "jersey-server": "mvn:org.glassfish.jersey.core:jersey-server:2.22.2",
     "jersey-test-framework-core": "mvn:org.glassfish.jersey.test-framework:jersey-test-framework-core:2.22.2",
-    "jersey-test-framework-grizzly2": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.22.2",
-    "jetty-util": "mvn:org.eclipse.jetty:jetty-util:8.1.18.v20150929",
+    "jersey-test-framework-jetty": "mvn:org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.22.2",
+    "jetty-util": "mvn:org.eclipse.jetty:jetty-util:9.1.6.v20160112",
     "jetty-websocket": "mvn:org.eclipse.jetty:jetty-websocket:8.1.18.v20150929",
+    "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112",
+    "jetty-continuation": "mvn:org.eclipse.jetty:jetty-continuation:9.1.6.v20160112",
+    "jetty-http": "mvn:org.eclipse.jetty:jetty-http:9.1.6.v20160112",
+    "jetty-io": "mvn:org.eclipse.jetty:jetty-io:9.1.6.v20160112",
+    "jetty-server": "mvn:org.eclipse.jetty:jetty-server:9.1.6.v20160112",
+    "javax.servlet-api": "mvn:javax.servlet:javax.servlet-api:3.1.0",
     "joda-time": "mvn:joda-time:joda-time:2.9",
     "jsch": "mvn:com.jcraft:jsch:0.1.53",
     "jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",