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/01/29 22:00:53 UTC
spark git commit: [SPARK-5466] Add explicit guava dependencies where
needed.
Repository: spark
Updated Branches:
refs/heads/master a3dc61848 -> f9e569452
[SPARK-5466] Add explicit guava dependencies where needed.
One side-effect of shading guava is that it disappears as a transitive
dependency. For Hadoop 2.x, this was masked by the fact that Hadoop
itself depends on guava. But certain versions of Hadoop 1.x also
shade guava, leaving either no guava or some random version pulled
by another dependency on the classpath.
So be explicit about the dependency in modules that use guava directly,
which is the right thing to do anyway.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #4272 from vanzin/SPARK-5466 and squashes the following commits:
e3f30e5 [Marcelo Vanzin] Dependency for catalyst is not needed.
d3b2c84 [Marcelo Vanzin] [SPARK-5466] Add explicit guava dependencies where needed.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f9e56945
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f9e56945
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f9e56945
Branch: refs/heads/master
Commit: f9e569452e2f0ae69037644170d8aa79ac6b4ccf
Parents: a3dc618
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Thu Jan 29 13:00:45 2015 -0800
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Thu Jan 29 13:00:45 2015 -0800
----------------------------------------------------------------------
core/pom.xml | 4 ++++
graphx/pom.xml | 4 ++++
streaming/pom.xml | 4 ++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f9e56945/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 3c51b2d..31e919a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -35,6 +35,10 @@
<url>http://spark.apache.org/</url>
<dependencies>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.twitter</groupId>
<artifactId>chill_${scala.binary.version}</artifactId>
<exclusions>
http://git-wip-us.apache.org/repos/asf/spark/blob/f9e56945/graphx/pom.xml
----------------------------------------------------------------------
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 72374aa..8fac24b 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -41,6 +41,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jblas</groupId>
<artifactId>jblas</artifactId>
<version>${jblas.version}</version>
http://git-wip-us.apache.org/repos/asf/spark/blob/f9e56945/streaming/pom.xml
----------------------------------------------------------------------
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 98f5b41..d032491 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -41,6 +41,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org