aboutsummaryrefslogtreecommitdiff
path: root/assembly
diff options
context:
space:
mode:
authorElmer Garduno <elmerg@google.com>2015-01-26 17:40:48 -0800
committerPatrick Wendell <patrick@databricks.com>2015-01-26 17:40:48 -0800
commit661e0fca5d5d86efab5fb26da600ac2ac96b09ec (patch)
treef35dc88cfddea9e00764de71c2c63d0f24a5c059 /assembly
parent0497ea51ac345f8057d222a18dbbf8eae78f5b92 (diff)
downloadspark-661e0fca5d5d86efab5fb26da600ac2ac96b09ec.tar.gz
spark-661e0fca5d5d86efab5fb26da600ac2ac96b09ec.tar.bz2
spark-661e0fca5d5d86efab5fb26da600ac2ac96b09ec.zip
[SPARK-5052] Add common/base classes to fix guava methods signatures.
Fixes problems with incorrect method signatures related to shaded classes. For discussion see the jira issue. Author: Elmer Garduno <elmerg@google.com> Closes #3874 from elmer-garduno/fix_guava_signatures and squashes the following commits: aa5d8e0 [Elmer Garduno] Unshade common/base[Function|Supplier] classes to fix guava methods signatures.
Diffstat (limited to 'assembly')
-rw-r--r--assembly/pom.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml
index b2a9d0780e..594fa0c779 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -142,8 +142,10 @@
</includes>
<excludes>
<exclude>com/google/common/base/Absent*</exclude>
+ <exclude>com/google/common/base/Function</exclude>
<exclude>com/google/common/base/Optional*</exclude>
<exclude>com/google/common/base/Present*</exclude>
+ <exclude>com/google/common/base/Supplier</exclude>
</excludes>
</relocation>
</relocations>