Skip to content

Commit 4b31f4e

Browse files
srowenpwendell
authored andcommitted
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
1 parent 925d8b2 commit 4b31f4e

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed

pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,10 @@
583583
<groupId>org.jboss.netty</groupId>
584584
<artifactId>netty</artifactId>
585585
</exclusion>
586+
<exclusion>
587+
<groupId>commons-logging</groupId>
588+
<artifactId>commons-logging</artifactId>
589+
</exclusion>
586590
</exclusions>
587591
</dependency>
588592
<dependency>
@@ -606,6 +610,10 @@
606610
<groupId>javax.servlet</groupId>
607611
<artifactId>servlet-api</artifactId>
608612
</exclusion>
613+
<exclusion>
614+
<groupId>commons-logging</groupId>
615+
<artifactId>commons-logging</artifactId>
616+
</exclusion>
609617
</exclusions>
610618
</dependency>
611619
<dependency>
@@ -625,6 +633,14 @@
625633
<groupId>org.jboss.netty</groupId>
626634
<artifactId>netty</artifactId>
627635
</exclusion>
636+
<exclusion>
637+
<groupId>javax.servlet</groupId>
638+
<artifactId>servlet-api</artifactId>
639+
</exclusion>
640+
<exclusion>
641+
<groupId>commons-logging</groupId>
642+
<artifactId>commons-logging</artifactId>
643+
</exclusion>
628644
</exclusions>
629645
</dependency>
630646
<dependency>
@@ -648,6 +664,10 @@
648664
<groupId>javax.servlet</groupId>
649665
<artifactId>servlet-api</artifactId>
650666
</exclusion>
667+
<exclusion>
668+
<groupId>commons-logging</groupId>
669+
<artifactId>commons-logging</artifactId>
670+
</exclusion>
651671
</exclusions>
652672
</dependency>
653673
<dependency>

0 commit comments

Comments
 (0)