Skip to content

Commit 793dbae

Browse files
committed
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 <[email protected]> Closes apache#4411 from pwendell/servlet-api and squashes the following commits: 445f868 [Patrick Wendell] SPARK-5557: Explicitly include servlet API in dependencies.
1 parent 7c0a648 commit 793dbae

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

core/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,13 @@
132132
<artifactId>jetty-servlet</artifactId>
133133
<scope>compile</scope>
134134
</dependency>
135+
<!-- Because we mark jetty as provided and shade it, its dependency
136+
orbit is ignored, so we explicitly list it here (see SPARK-5557).-->
137+
<dependency>
138+
<groupId>org.eclipse.jetty.orbit</groupId>
139+
<artifactId>javax.servlet</artifactId>
140+
<version>${orbit.version}</version>
141+
</dependency>
135142

136143
<dependency>
137144
<groupId>org.apache.commons</groupId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
<parquet.version>1.6.0rc3</parquet.version>
136136
<jblas.version>1.2.3</jblas.version>
137137
<jetty.version>8.1.14.v20131031</jetty.version>
138+
<orbit.version>3.0.0.v201112011016</orbit.version>
138139
<chill.version>0.5.0</chill.version>
139140
<kryo.version>2.24.0</kryo.version>
140141
<ivy.version>2.4.0</ivy.version>

0 commit comments

Comments
 (0)