Repository: spark Updated Branches: refs/heads/master 0497ea51a -> 661e0fca5
[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 <[email protected]> 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. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/661e0fca Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/661e0fca Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/661e0fca Branch: refs/heads/master Commit: 661e0fca5d5d86efab5fb26da600ac2ac96b09ec Parents: 0497ea5 Author: Elmer Garduno <[email protected]> Authored: Mon Jan 26 17:40:48 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Mon Jan 26 17:40:48 2015 -0800 ---------------------------------------------------------------------- assembly/pom.xml | 2 ++ core/pom.xml | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/661e0fca/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index b2a9d07..594fa0c 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> http://git-wip-us.apache.org/repos/asf/spark/blob/661e0fca/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d9a49c9..1984682 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
