Skip to content
Snippets Groups Projects
Commit 661e0fca authored by Elmer Garduno's avatar Elmer Garduno Committed by Patrick Wendell
Browse files

[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.
parent 0497ea51
No related branches found
No related tags found
No related merge requests found
...@@ -142,8 +142,10 @@ ...@@ -142,8 +142,10 @@
</includes> </includes>
<excludes> <excludes>
<exclude>com/google/common/base/Absent*</exclude> <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/Optional*</exclude>
<exclude>com/google/common/base/Present*</exclude> <exclude>com/google/common/base/Present*</exclude>
<exclude>com/google/common/base/Supplier</exclude>
</excludes> </excludes>
</relocation> </relocation>
</relocations> </relocations>
......
...@@ -372,8 +372,10 @@ ...@@ -372,8 +372,10 @@
<artifact>com.google.guava:guava</artifact> <artifact>com.google.guava:guava</artifact>
<includes> <includes>
<include>com/google/common/base/Absent*</include> <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/Optional*</include>
<include>com/google/common/base/Present*</include> <include>com/google/common/base/Present*</include>
<include>com/google/common/base/Supplier</include>
</includes> </includes>
</filter> </filter>
</filters> </filters>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment