From 274966e675d03875d4522440d1e4d0ab1ba04f23 Mon Sep 17 00:00:00 2001
From: Erik Krogen <xkrogen@apache.org>
Date: Tue, 13 Aug 2019 08:52:59 -0700
Subject: [PATCH] HDFS-14717. [Dynamometer] Remove explicit search for JUnit
 dependency JAR from Dynamometer Client as it is packaged in the primary JAR.
 Contributed by Kevin Su.

---
 .../java/org/apache/hadoop/tools/dynamometer/Client.java    | 6 +-----
 .../hadoop/tools/dynamometer/TestDynamometerInfra.java      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
index eba9c70b86..3863993cba 100644
--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
+++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/main/java/org/apache/hadoop/tools/dynamometer/Client.java
@@ -97,7 +97,6 @@
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.exceptions.YarnException;
 import org.apache.hadoop.yarn.util.Records;
-import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -253,10 +252,7 @@ public class Client extends Configured implements Tool {
    */
   public static void main(String[] args) throws Exception {
     Client client = new Client(
-        ClassUtil.findContainingJar(ApplicationMaster.class),
-        // JUnit is required by MiniDFSCluster at runtime, but is not included
-        // in standard Hadoop dependencies, so it must explicitly included here
-        ClassUtil.findContainingJar(Assert.class));
+        ClassUtil.findContainingJar(ApplicationMaster.class));
     System.exit(ToolRunner.run(new YarnConfiguration(), client, args));
   }
 
diff --git a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
index 5d5ccf13d9..b008095eff 100644
--- a/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
+++ b/hadoop-tools/hadoop-dynamometer/hadoop-dynamometer-infra/src/test/java/org/apache/hadoop/tools/dynamometer/TestDynamometerInfra.java
@@ -122,7 +122,7 @@ public class TestDynamometerInfra {
   private static final String HADOOP_BIN_PATH_KEY = "dyno.hadoop.bin.path";
   private static final String HADOOP_BIN_VERSION_KEY =
       "dyno.hadoop.bin.version";
-  private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.1";
+  private static final String HADOOP_BIN_VERSION_DEFAULT = "3.1.2";
   private static final String FSIMAGE_FILENAME = "fsimage_0000000000000061740";
   private static final String VERSION_FILENAME = "VERSION";