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:29 -0700 |
| commit | 4b31f4ec7efab8eabf956284a99bfd96a58b79f7 (patch) | |
| tree | 9e1ee8ed425b077ee7f92e6c149f91b2393da640 /pom.xml | |
| parent | 925d8b249b84d2706c52f0d1e29fb8dcd6de452e (diff) | |
| download | spark-4b31f4ec7efab8eabf956284a99bfd96a58b79f7.tar.gz spark-4b31f4ec7efab8eabf956284a99bfd96a58b79f7.tar.bz2 spark-4b31f4ec7efab8eabf956284a99bfd96a58b79f7.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
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -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> |