(incubator-uniffle) branch master updated: [#1699][FOLLOWUP] chore(client): Using collection4 instead of collection3 (#2042)

[zuston]

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 a12e94e64 [#1699][FOLLOWUP] chore(client): Using collection4 instead 
of collection3 (#2042)
a12e94e64 is described below

commit a12e94e64b30f672b78528749128efcb5946bb7a
Author: maobaolong <baoloong...@tencent.com>
AuthorDate: Mon Aug 19 11:15:58 2024 +0800

    [#1699][FOLLOWUP] chore(client): Using collection4 instead of collection3 
(#2042)
    
    ### What changes were proposed in this pull request?
    
    Upgrade from commons-collections:commons-collections:3.x to 
org.apache.commons:commons-collections:4.x
    
    ### Why are the changes needed?
    
    Fix: #1699
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Existing UTs.
---
 .../java/org/apache/uniffle/shuffle/manager/RssShuffleManagerBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/client-spark/common/src/main/java/org/apache/uniffle/shuffle/manager/RssShuffleManagerBase.java
 
b/client-spark/common/src/main/java/org/apache/uniffle/shuffle/manager/RssShuffleManagerBase.java
index d7bcebf49..b3bd13856 100644
--- 
a/client-spark/common/src/main/java/org/apache/uniffle/shuffle/manager/RssShuffleManagerBase.java
+++ 
b/client-spark/common/src/main/java/org/apache/uniffle/shuffle/manager/RssShuffleManagerBase.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.spark.MapOutputTracker;