Repository: spark Updated Branches: refs/heads/master 733b81b83 -> 5d71f3db8
[SPARK-20514][CORE] Upgrade Jetty to 9.3.11.v20160721 Upgrade Jetty so it can work with Hadoop 3 (alpha 2 release, in particular). Without this change, because of incompatibily between Jetty versions, Spark fails to compile when built against Hadoop 3 ## How was this patch tested? Unit tests being run. Author: Mark Grover <m...@apache.org> Closes #17790 from markgrover/spark-20514. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5d71f3db Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5d71f3db Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5d71f3db Branch: refs/heads/master Commit: 5d71f3db83138bf50749dcd425ef7365c34bd799 Parents: 733b81b Author: Mark Grover <m...@apache.org> Authored: Fri Apr 28 14:06:57 2017 -0700 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Fri Apr 28 14:06:57 2017 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/ui/JettyUtils.scala | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/5d71f3db/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala index bdbdba5..edf328b 100644 --- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala @@ -29,8 +29,8 @@ import org.eclipse.jetty.client.api.Response import org.eclipse.jetty.proxy.ProxyServlet import org.eclipse.jetty.server._ import org.eclipse.jetty.server.handler._ +import org.eclipse.jetty.server.handler.gzip.GzipHandler import org.eclipse.jetty.servlet._ -import org.eclipse.jetty.servlets.gzip.GzipHandler import org.eclipse.jetty.util.component.LifeCycle import org.eclipse.jetty.util.thread.{QueuedThreadPool, ScheduledExecutorScheduler} import org.json4s.JValue http://git-wip-us.apache.org/repos/asf/spark/blob/5d71f3db/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b6654c1..517ebc5 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ <derby.version>10.12.1.1</derby.version> <parquet.version>1.8.2</parquet.version> <hive.parquet.version>1.6.0</hive.parquet.version> - <jetty.version>9.2.16.v20160414</jetty.version> + <jetty.version>9.3.11.v20160721</jetty.version> <javaxservlet.version>3.1.0</javaxservlet.version> <chill.version>0.8.0</chill.version> <ivy.version>2.4.0</ivy.version> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
