Skip to content

Commit 3cde990

Browse files
Fred Jinickpan47
authored andcommitted
SAMZA-1048 : upgrade jetty dependency to Jetty 9 from Jetty 8
Jetty 8 is a very old jetty version and the current widely used version is Jetty 9. If a user is using standalone Samza in a Jetty container, and he/she is using Jetty 9, he/she may see some incompatibility issue and it makes a lot of sense for a user to upgrade the Jetty version on his/her side instead of downgrading the Jetty version. Author: Fred Ji <[email protected]> Reviewers: Yi Pan <[email protected]> Closes apache#20 from fredji97/master
1 parent 1e5f30f commit 3cde990

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

gradle/dependency-versions-scala-2.10.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ ext {
2525
// -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import
2626
scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls"
2727
scalatraVersion = "2.2.1"
28-
jettyVersion = "8.1.8.v20121106"
28+
jettyVersion = "9.2.7.v20150116"
2929
}

samza-core/src/main/scala/org/apache/samza/coordinator/server/HttpServer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package org.apache.samza.coordinator.server;
2121

2222
import javax.servlet.Servlet
2323
import org.apache.samza.SamzaException
24-
import org.eclipse.jetty.server.Connector
24+
import org.eclipse.jetty.server.NetworkConnector
2525
import org.eclipse.jetty.server.Server
2626
import org.eclipse.jetty.servlet.DefaultServlet
2727
import org.eclipse.jetty.servlet.ServletContextHandler
@@ -129,7 +129,7 @@ class HttpServer(
129129
*/
130130
def getUrl = {
131131
if (running) {
132-
val runningPort = server.getConnectors()(0).asInstanceOf[Connector].getLocalPort()
132+
val runningPort = server.getConnectors()(0).asInstanceOf[NetworkConnector].getLocalPort()
133133

134134
new URL("http://" + Util.getLocalHost.getHostName + ":" + runningPort + rootPath)
135135
} else {

samza-rest/src/main/java/org/apache/samza/rest/SamzaRestService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.apache.samza.util.CommandLine;
3131
import org.apache.samza.util.MetricsReporterLoader;
3232
import org.apache.samza.util.Util;
33+
import org.eclipse.jetty.server.NetworkConnector;
3334
import org.eclipse.jetty.server.Server;
3435
import org.eclipse.jetty.servlet.ServletContextHandler;
3536
import org.eclipse.jetty.servlet.ServletHolder;
@@ -165,7 +166,7 @@ public void start()
165166
log.info("Starting the metrics reporter : {}.", reporterName);
166167
metricsReporter.start();
167168
});
168-
log.info("Starting server on port {}", server.getConnectors()[0].getPort());
169+
log.info("Starting server on port {}", ((NetworkConnector) server.getConnectors()[0]).getPort());
169170
server.start();
170171
log.info("Server is running");
171172
}

0 commit comments

Comments
 (0)