From 793dbaef401d777c3efc1759a3ea7580e01de528 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <patrick@databricks.com>
Date: Thu, 5 Feb 2015 18:14:54 -0800
Subject: SPARK-5557: Explicitly include servlet API in dependencies.

Because of the way we shade jetty, we lose its dependency orbit
in the assembly jar, which includes the javax servlet API's. This
adds back orbit explicitly, using the version that matches
our jetty version.

Author: Patrick Wendell <patrick@databricks.com>

Closes #4411 from pwendell/servlet-api and squashes the following commits:

445f868 [Patrick Wendell] SPARK-5557: Explicitly include servlet API in dependencies.
---
 core/pom.xml | 7 +++++++
 pom.xml      | 1 +
 2 files changed, 8 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 2dc5f747f2..4daaf88147 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -132,6 +132,13 @@
       <artifactId>jetty-servlet</artifactId>
       <scope>compile</scope>
     </dependency>
+    <!-- Because we mark jetty as provided and shade it, its dependency
+         orbit is ignored, so we explicitly list it here (see SPARK-5557).-->
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <version>${orbit.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index d324b5f0ec..727cd0a36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
     <parquet.version>1.6.0rc3</parquet.version>
     <jblas.version>1.2.3</jblas.version>
     <jetty.version>8.1.14.v20131031</jetty.version>
+    <orbit.version>3.0.0.v201112011016</orbit.version>
     <chill.version>0.5.0</chill.version>
     <kryo.version>2.24.0</kryo.version>
     <ivy.version>2.4.0</ivy.version>
-- 
cgit v1.2.3