diff options
| -rw-r--r-- | core/pom.xml | 7 | ||||
| -rw-r--r-- | pom.xml | 1 |
2 files changed, 8 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> @@ -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> |