From 661e0fca5d5d86efab5fb26da600ac2ac96b09ec Mon Sep 17 00:00:00 2001
From: Elmer Garduno <elmerg@google.com>
Date: Mon, 26 Jan 2015 17:40:48 -0800
Subject: [PATCH] [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.
---
assembly/pom.xml | 2 ++
core/pom.xml | 2 ++
2 files changed, 4 insertions(+)
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>
diff --git a/core/pom.xml b/core/pom.xml
index d9a49c9e08..1984682b9c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -372,8 +372,10 @@
<artifact>com.google.guava:guava</artifact>
<includes>
<include>com/google/common/base/Absent*</include>
+ <include>com/google/common/base/Function</include>
<include>com/google/common/base/Optional*</include>
<include>com/google/common/base/Present*</include>
+ <include>com/google/common/base/Supplier</include>
</includes>
</filter>
</filters>
--
GitLab