diff -Nru apache-curator-2.10.0/curator-x-discovery-server/pom.xml apache-curator-2.10.0.jetty/curator-x-discovery-server/pom.xml
--- apache-curator-2.10.0/curator-x-discovery-server/pom.xml 2016-02-10 15:16:12.000000000 +0100
+++ apache-curator-2.10.0.jetty/curator-x-discovery-server/pom.xml 2016-04-04 18:58:20.927598194 +0200
@@ -92,8 +92,16 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
<scope>test</scope>
</dependency>
diff -Nru apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java
--- apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2016-02-10 15:16:12.000000000 +0100
+++ apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java 2016-04-04 19:00:56.884193931 +0200
@@ -39,9 +39,9 @@
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
-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;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -93,7 +93,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java
--- apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2016-02-10 15:16:12.000000000 +0100
+++ apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java 2016-04-04 19:02:08.196351028 +0200
@@ -37,9 +37,9 @@
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
-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;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -90,7 +90,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java
--- apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2016-02-10 15:16:12.000000000 +0100
+++ apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java 2016-04-04 19:03:07.968130018 +0200
@@ -38,9 +38,9 @@
import org.apache.curator.x.discovery.server.entity.ServiceNames;
import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery;
import org.apache.curator.x.discovery.strategies.RandomStrategy;
-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;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -91,7 +91,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.addServlet(new ServletHolder(container), "/*");
server.start();
}
diff -Nru apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java
--- apache-curator-2.10.0/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2016-02-10 15:16:12.000000000 +0100
+++ apache-curator-2.10.0.jetty/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java 2016-04-04 19:04:11.506706021 +0200
@@ -29,9 +29,9 @@
import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap;
import org.jboss.resteasy.spi.ResteasyProviderFactory;
-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;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -64,7 +64,7 @@
port = InstanceSpec.getRandomPort();
server = new Server(port);
- Context root = new Context(server, "/", Context.SESSIONS);
+ ServletContextHandler root = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
root.getInitParams().put("javax.ws.rs.Application", RestEasyApplication.class.getName());
root.addServlet(new ServletHolder(dispatcher), "/*");
root.addEventListener(new ResteasyBootstrap());
diff -Nru apache-curator-2.10.0/pom.xml apache-curator-2.10.0.jetty/pom.xml
--- apache-curator-2.10.0/pom.xml 2016-04-04 19:05:35.144198925 +0200
+++ apache-curator-2.10.0.jetty/pom.xml 2016-04-04 18:56:41.052980285 +0200
@@ -72,7 +72,7 @@
<jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
<jersey-version>1.18.1</jersey-version>
<jsr311-api-version>1.1.1</jsr311-api-version>
- <jetty-version>6.1.26</jetty-version>
+ <jetty-version>9.3.0.v20150612</jetty-version>
<scannotation-version>1.0.2</scannotation-version>
<resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version>
<guava-version>16.0.1</guava-version>
@@ -395,8 +395,8 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<version>${jetty-version}</version>
</dependency>
