You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/02/06 03:14:55 UTC
spark git commit: SPARK-5557: Explicitly include servlet API in
dependencies.
Repository: spark
Updated Branches:
refs/heads/master 7c0a648fb -> 793dbaef4
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 <pa...@databricks.com>
Closes #4411 from pwendell/servlet-api and squashes the following commits:
445f868 [Patrick Wendell] SPARK-5557: Explicitly include servlet API in dependencies.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/793dbaef
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/793dbaef
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/793dbaef
Branch: refs/heads/master
Commit: 793dbaef401d777c3efc1759a3ea7580e01de528
Parents: 7c0a648
Author: Patrick Wendell <pa...@databricks.com>
Authored: Thu Feb 5 18:14:54 2015 -0800
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Thu Feb 5 18:14:54 2015 -0800
----------------------------------------------------------------------
core/pom.xml | 7 +++++++
pom.xml | 1 +
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/793dbaef/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2dc5f74..4daaf88 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>
http://git-wip-us.apache.org/repos/asf/spark/blob/793dbaef/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d324b5f..727cd0a 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org