This is an automated email from the ASF dual-hosted git repository.
zuston pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new 27d6fca88 [#1699][FOLLOWUP] fix(client): Add commons-collections4
dependencies in shaded clients (#1742)
27d6fca88 is described below
commit 27d6fca88354a26a1b51284c82b4fde639c60e8b
Author: RickyMa <[email protected]>
AuthorDate: Mon Jun 3 14:50:03 2024 +0800
[#1699][FOLLOWUP] fix(client): Add commons-collections4 dependencies in
shaded clients (#1742)
### What changes were proposed in this pull request?
Add `commons-collections4` dependencies in shaded clients.
### Why are the changes needed?
After https://github.com/apache/incubator-uniffle/pull/1700, in some old
versions of Spark, the `commons-collections4` dependency could be missing. Add
the potential missing dependency to improve robustness.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing UTs. Tested in our env.
---
client-mr/core/pom.xml | 1 +
client-spark/spark2-shaded/pom.xml | 1 +
client-spark/spark3-shaded/pom.xml | 1 +
client-tez/pom.xml | 1 +
4 files changed, 4 insertions(+)
diff --git a/client-mr/core/pom.xml b/client-mr/core/pom.xml
index 8368c3054..e2c0ad5a1 100644
--- a/client-mr/core/pom.xml
+++ b/client-mr/core/pom.xml
@@ -159,6 +159,7 @@
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
<include>net.jpountz.lz4:lz4</include>
+
<include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/client-spark/spark2-shaded/pom.xml
b/client-spark/spark2-shaded/pom.xml
index 95bed3c28..81250936b 100644
--- a/client-spark/spark2-shaded/pom.xml
+++ b/client-spark/spark2-shaded/pom.xml
@@ -68,6 +68,7 @@
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
+ <include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/client-spark/spark3-shaded/pom.xml
b/client-spark/spark3-shaded/pom.xml
index ca40149c7..7c4580cb5 100644
--- a/client-spark/spark3-shaded/pom.xml
+++ b/client-spark/spark3-shaded/pom.xml
@@ -68,6 +68,7 @@
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
+ <include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/client-tez/pom.xml b/client-tez/pom.xml
index e55207b3d..52430441f 100644
--- a/client-tez/pom.xml
+++ b/client-tez/pom.xml
@@ -174,6 +174,7 @@
<include>org.roaringbitmap:RoaringBitmap</include>
<include>org.roaringbitmap:shims</include>
<include>net.jpountz.lz4:lz4</include>
+
<include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<finalName>${project.artifactId}-${project.version}</finalName>
