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 2014/05/13 02:35:34 UTC
git commit: SPARK-1802. (Addendium) Audit dependency graph when Spark
is built with -Pyarn
Repository: spark
Updated Branches:
refs/heads/master 925d8b249 -> 4b31f4ec7
SPARK-1802. (Addendium) Audit dependency graph when Spark is built with -Pyarn
Following on a few more items from SPARK-1802 --
The first commit touches up a few similar problems remaining with the YARN profile. I think this is worth cherry-picking.
The second commit is more of the same for hadoop-client, although the fix is a little more complex. It may or may not be worth bothering with.
Author: Sean Owen <so...@cloudera.com>
Closes #746 from srowen/SPARK-1802.2 and squashes the following commits:
52aeb41 [Sean Owen] Add more commons-logging, servlet excludes to avoid conflicts in assembly when building for YARN
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4b31f4ec
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4b31f4ec
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4b31f4ec
Branch: refs/heads/master
Commit: 4b31f4ec7efab8eabf956284a99bfd96a58b79f7
Parents: 925d8b2
Author: Sean Owen <so...@cloudera.com>
Authored: Mon May 12 17:35:29 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon May 12 17:35:29 2014 -0700
----------------------------------------------------------------------
pom.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4b31f4ec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3554efa..4d4c5f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -583,6 +583,10 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -606,6 +610,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -625,6 +633,14 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -648,6 +664,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>