Repository: spark Updated Branches: refs/heads/branch-1.0 c294f37f9 -> 02caa7e7e
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 <[email protected]> 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 (cherry picked from commit 4b31f4ec7efab8eabf956284a99bfd96a58b79f7) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/02caa7e7 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/02caa7e7 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/02caa7e7 Branch: refs/heads/branch-1.0 Commit: 02caa7e7eb28fe6ac58ae110bdad3802d66b759d Parents: c294f37 Author: Sean Owen <[email protected]> Authored: Mon May 12 17:35:29 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Mon May 12 17:35:41 2014 -0700 ---------------------------------------------------------------------- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/02caa7e7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c2d0f2f..b412e80 100644 --- a/pom.xml +++ b/pom.xml @@ -582,6 +582,10 @@ <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -605,6 +609,10 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -624,6 +632,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> @@ -647,6 +663,10 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency>
