[tez] branch branch-0.9 updated: Reduce apache commons collections direct dependencies

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 5116079  Reduce apache commons collections direct dependencies
5116079 is described below

commit 5116079b57d02ad18234d209345f93e59f3032d8
Author: Zhang Butao <zh...@cmss.chinamobile.com>
AuthorDate: Mon Mar 16 16:27:22 2020 +0000

    Reduce apache commons collections direct dependencies
    
    Signed-off-by: Jonathan Eagles <je...@apache.org>
    (cherry picked from commit 9df9f100e5f4e17f4fa67b69623a7bc8f6fd454c)
---
 pom.xml                                                        |  5 -----
 tez-dist/dist-files/minimal/LICENSE                            |  1 -
 tez-mapreduce/pom.xml                                          |  4 ----
 .../org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java     |  2 +-
 .../java/org/apache/tez/history/parser/datamodel/DagInfo.java  | 10 +++++-----
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3bfdbc..89ed4fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -262,11 +262,6 @@
         <version>1.4</version>
       </dependency>
       <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2.2</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-common</artifactId>
         <version>${hadoop.version}</version>
diff --git a/tez-dist/dist-files/minimal/LICENSE b/tez-dist/dist-files/minimal/LICENSE
index c89bc24..0e06dc6 100644
--- a/tez-dist/dist-files/minimal/LICENSE
+++ b/tez-dist/dist-files/minimal/LICENSE
@@ -234,7 +234,6 @@ license:
   - hadoop-shim-*.jar
   - async-http-client-*.jar
   - commons-cli-*.jar
-  - commons-collections-*.jar
   - commons-io-*.jar 
   - commons-math3-*.jar
   - commons-codec-*.jar
diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
index e72cc66..7607575 100644
--- a/tez-mapreduce/pom.xml
+++ b/tez-mapreduce/pom.xml
@@ -85,10 +85,6 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.tez</groupId>
       <artifactId>tez-runtime-internals</artifactId>
       <scope>test</scope>
diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
index cc9b6ba..b6b8e15 100644
--- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
+++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/mapred/MRCounters.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 
 public class MRCounters extends org.apache.hadoop.mapred.Counters {
   private final org.apache.tez.common.counters.TezCounters raw;
diff --git a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/DagInfo.java b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/DagInfo.java
index 544e86a..64ddcf8 100644
--- a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/DagInfo.java
+++ b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/DagInfo.java
@@ -28,8 +28,8 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
-import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.bidimap.DualHashBidiMap;
+import org.apache.commons.collections4.BidiMap;
+import org.apache.commons.collections4.bidimap.DualHashBidiMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.util.StringInterner;
@@ -71,7 +71,7 @@ public class DagInfo extends BaseInfo {
   private CallerContext callerContext;
 
   //VertexID --> VertexName & vice versa
-  private final BidiMap vertexNameIDMapping;
+  private final BidiMap<String, String> vertexNameIDMapping;
 
   //edgeId to EdgeInfo mapping
   private final Map<Integer, EdgeInfo> edgeInfoMap;
@@ -89,7 +89,7 @@ public class DagInfo extends BaseInfo {
     super(jsonObject);
 
     vertexNameMap = Maps.newHashMap();
-    vertexNameIDMapping = new DualHashBidiMap();
+    vertexNameIDMapping = new DualHashBidiMap<>();
     edgeInfoMap = Maps.newHashMap();
     basicVertexInfoMap = Maps.newHashMap();
     containerMapping = LinkedHashMultimap.create();
@@ -607,7 +607,7 @@ public class DagInfo extends BaseInfo {
     return Multimaps.unmodifiableMultimap(containerMapping);
   }
 
-  public final Map getVertexNameIDMapping() {
+  public final Map<String, String> getVertexNameIDMapping() {
     return vertexNameIDMapping;
   }