diff --git a/pom.xml b/pom.xml
index 7d4d6f2374..4edb306215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
- 8.1.9.v20130131
+ 9.0.0.v20130308
UTF-8
@@ -49,7 +49,13 @@
- org.eclipse.jetty.aggregate
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
+
+
+
+ org.eclipse.jetty
jetty-webapp
${jetty.version}
@@ -95,12 +101,22 @@
maven-compiler-plugin
2.3.2
-
- 1.6
+
+ 1.7
true
true
+
+ true
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.14
+
+ 1
+ false
+
+
org.apache.maven.plugins
diff --git a/src/main/java/spark/webserver/SparkServerImpl.java b/src/main/java/spark/webserver/SparkServerImpl.java
index 1bdce172d7..e6f66359eb 100644
--- a/src/main/java/spark/webserver/SparkServerImpl.java
+++ b/src/main/java/spark/webserver/SparkServerImpl.java
@@ -19,7 +19,7 @@
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
/**
* Spark server implementation
@@ -57,10 +57,11 @@ public void ignite(String host) {
@Override
public void ignite(String host, int port) {
- SocketConnector connector = new SocketConnector();
+ Server server = new Server();
+ ServerConnector connector = new ServerConnector(server);
// Set some timeout options to make debugging easier.
- connector.setMaxIdleTime(1000 * 60 * 60);
+ connector.setIdleTimeout(1000 * 60 * 60);
connector.setSoLingerTime(-1);
connector.setHost(host);
connector.setPort(port);
diff --git a/src/test/java/spark/servlet/ServletTest.java b/src/test/java/spark/servlet/ServletTest.java
index c03b258992..41c0c4aeef 100644
--- a/src/test/java/spark/servlet/ServletTest.java
+++ b/src/test/java/spark/servlet/ServletTest.java
@@ -9,7 +9,7 @@
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -37,10 +37,11 @@ public static void tearDown() {
public static void setup() {
testUtil = new SparkTestUtil(PORT);
- SocketConnector connector = new SocketConnector();
+ final Server server = new Server();
+ ServerConnector connector = new ServerConnector(server);
// Set some timeout options to make debugging easier.
- connector.setMaxIdleTime(1000 * 60 * 60);
+ connector.setIdleTimeout(1000 * 60 * 60);
connector.setSoLingerTime(-1);
connector.setPort(PORT);
server.setConnectors(new Connector[] { connector });