diff options
| author | Sean Owen <sowen@cloudera.com> | 2014-05-12 17:35:29 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-05-12 17:35:41 -0700 |
| commit | 02caa7e7eb28fe6ac58ae110bdad3802d66b759d (patch) | |
| tree | 6eb3ede95e16345005b9c6fdfdc91f91cf1d1b32 | |
| parent | c294f37f9ac9887266829c68ffb5315e01d4c0f7 (diff) | |
| download | spark-02caa7e7eb28fe6ac58ae110bdad3802d66b759d.tar.gz spark-02caa7e7eb28fe6ac58ae110bdad3802d66b759d.tar.bz2 spark-02caa7e7eb28fe6ac58ae110bdad3802d66b759d.zip | |
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 <sowen@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
(cherry picked from commit 4b31f4ec7efab8eabf956284a99bfd96a58b79f7)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
| -rw-r--r-- | pom.xml | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -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> |