Skip to content

Commit 661e0fc

Browse files
elmer-gardunopwendell
authored andcommitted
[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 apache#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.
1 parent 0497ea5 commit 661e0fc

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

assembly/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@
142142
</includes>
143143
<excludes>
144144
<exclude>com/google/common/base/Absent*</exclude>
145+
<exclude>com/google/common/base/Function</exclude>
145146
<exclude>com/google/common/base/Optional*</exclude>
146147
<exclude>com/google/common/base/Present*</exclude>
148+
<exclude>com/google/common/base/Supplier</exclude>
147149
</excludes>
148150
</relocation>
149151
</relocations>

core/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,10 @@
372372
<artifact>com.google.guava:guava</artifact>
373373
<includes>
374374
<include>com/google/common/base/Absent*</include>
375+
<include>com/google/common/base/Function</include>
375376
<include>com/google/common/base/Optional*</include>
376377
<include>com/google/common/base/Present*</include>
378+
<include>com/google/common/base/Supplier</include>
377379
</includes>
378380
</filter>
379381
</filters>

0 commit comments

Comments
 (0)