Skip to content

Commit 94fe7fd

Browse files
andrewor14pwendell
authored andcommitted
[SPARK-1377] Upgrade Jetty to 8.1.14v20131031
Previous version was 7.6.8v20121106. The only difference between Jetty 7 and Jetty 8 is that the former uses Servlet API 2.5, while the latter uses Servlet API 3.0. Author: Andrew Or <[email protected]> Closes #280 from andrewor14/jetty-upgrade and squashes the following commits: dd57104 [Andrew Or] Merge github.com:apache/spark into jetty-upgrade e75fa85 [Andrew Or] Upgrade Jetty to 8.1.14v20131031
1 parent 564f1c1 commit 94fe7fd

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

core/src/main/scala/org/apache/spark/ui/JettyUtils.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
package org.apache.spark.ui
1919

2020
import java.net.{InetSocketAddress, URL}
21+
import javax.servlet.DispatcherType
2122
import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
2223

2324
import scala.annotation.tailrec
2425
import scala.util.{Failure, Success, Try}
2526
import scala.xml.Node
2627

27-
import org.eclipse.jetty.server.{DispatcherType, Server}
28+
import org.eclipse.jetty.server.Server
2829
import org.eclipse.jetty.server.handler._
2930
import org.eclipse.jetty.servlet._
3031
import org.eclipse.jetty.util.thread.QueuedThreadPool

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,22 +192,22 @@
192192
<dependency>
193193
<groupId>org.eclipse.jetty</groupId>
194194
<artifactId>jetty-util</artifactId>
195-
<version>7.6.8.v20121106</version>
195+
<version>8.1.14.v20131031</version>
196196
</dependency>
197197
<dependency>
198198
<groupId>org.eclipse.jetty</groupId>
199199
<artifactId>jetty-security</artifactId>
200-
<version>7.6.8.v20121106</version>
200+
<version>8.1.14.v20131031</version>
201201
</dependency>
202202
<dependency>
203203
<groupId>org.eclipse.jetty</groupId>
204204
<artifactId>jetty-plus</artifactId>
205-
<version>7.6.8.v20121106</version>
205+
<version>8.1.14.v20131031</version>
206206
</dependency>
207207
<dependency>
208208
<groupId>org.eclipse.jetty</groupId>
209209
<artifactId>jetty-server</artifactId>
210-
<version>7.6.8.v20121106</version>
210+
<version>8.1.14.v20131031</version>
211211
</dependency>
212212
<dependency>
213213
<groupId>com.google.guava</groupId>

project/SparkBuild.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ object SparkBuild extends Build {
248248
*/
249249

250250
libraryDependencies ++= Seq(
251-
"io.netty" % "netty-all" % "4.0.17.Final",
252-
"org.eclipse.jetty" % "jetty-server" % "7.6.8.v20121106",
253-
"org.eclipse.jetty" % "jetty-util" % "7.6.8.v20121106",
254-
"org.eclipse.jetty" % "jetty-plus" % "7.6.8.v20121106",
255-
"org.eclipse.jetty" % "jetty-security" % "7.6.8.v20121106",
251+
"io.netty" % "netty-all" % "4.0.17.Final",
252+
"org.eclipse.jetty" % "jetty-server" % "8.1.14.v20131031",
253+
"org.eclipse.jetty" % "jetty-util" % "8.1.14.v20131031",
254+
"org.eclipse.jetty" % "jetty-plus" % "8.1.14.v20131031",
255+
"org.eclipse.jetty" % "jetty-security" % "8.1.14.v20131031",
256256
/** Workaround for SPARK-959. Dependency used by org.eclipse.jetty. Fixed in ivy 2.3.0. */
257-
"org.eclipse.jetty.orbit" % "javax.servlet" % "2.5.0.v201103041518" artifacts Artifact("javax.servlet", "jar", "jar"),
257+
"org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" artifacts Artifact("javax.servlet", "jar", "jar"),
258258
"org.scalatest" %% "scalatest" % "1.9.1" % "test",
259259
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test",
260260
"com.novocode" % "junit-interface" % "0.10" % "test",

0 commit comments

Comments
 (0)