diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-02-05 18:14:54 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-02-05 18:14:54 -0800 |
| commit | 793dbaef401d777c3efc1759a3ea7580e01de528 (patch) | |
| tree | 1ad5de29f412134774cd2f4ae2965473bdaeff42 /core | |
| parent | 7c0a648fb5537ba7a1fe2545ead49219b14b656c (diff) | |
| download | spark-793dbaef401d777c3efc1759a3ea7580e01de528.tar.gz spark-793dbaef401d777c3efc1759a3ea7580e01de528.tar.bz2 spark-793dbaef401d777c3efc1759a3ea7580e01de528.zip | |
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/pom.xml | 7 |
1 files changed, 7 insertions, 0 deletions
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> |