From 1f1ccb3e32631cafedfc8c9c5d9f1982bfb36ce6 Mon Sep 17 00:00:00 2001
From: Yiwei Li <yiweili6@illinois.edu>
Date: Thu, 10 Nov 2022 21:39:34 -0600
Subject: [PATCH 1/4] HBASE-27479 fix flaky test testClone in TestTaskMonitor

---
 hbase-server/pom.xml                                        | 6 ++++++
 .../org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 8a6cd299772c..da0756009ce9 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -333,6 +333,12 @@
       <artifactId>bcpkix-jdk15on</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.skyscreamer</groupId>
+      <artifactId>jsonassert</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <!-- Make sure resources get added before they are processed by placing this first
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index ee5ea621eaa2..458048f50a46 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -40,6 +40,7 @@
 import org.junit.experimental.categories.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 @Category({ MiscTests.class, SmallTests.class })
 public class TestTaskMonitor {
@@ -238,8 +239,8 @@ public void testClone() throws Exception {
     assertEquals(clone.getStatus(), monitor.getStatus());
     assertEquals(clone.toString(), monitor.toString());
     assertEquals(clone.toMap(), monitor.toMap());
-    assertEquals(clone.toJSON(), monitor.toJSON());
-
+    JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(),true);
+    
     // mark complete and make param dirty
     monitor.markComplete("complete RPC");
     testParam.setParam("dirtyParam");

From 55b32255d903b986e0bcae6a44d9ae03d80522fb Mon Sep 17 00:00:00 2001
From: Yiwei Li <yiweili6@illinois.edu>
Date: Tue, 15 Nov 2022 21:14:01 -0600
Subject: [PATCH 2/4] HBASE-27479 add dependency to parent pom and fix style
 issue

---
 hbase-server/pom.xml                                         | 1 -
 .../org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java  | 2 +-
 pom.xml                                                      | 5 +++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index da0756009ce9..0dba4aa98339 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -336,7 +336,6 @@
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
-      <version>1.5.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index 458048f50a46..671fa135acac 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -38,9 +38,9 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.skyscreamer.jsonassert.JSONAssert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.skyscreamer.jsonassert.JSONAssert;
 
 @Category({ MiscTests.class, SmallTests.class })
 public class TestTaskMonitor {
diff --git a/pom.xml b/pom.xml
index 6a70a35a5c2c..3467270abd05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1017,6 +1017,11 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.skyscreamer</groupId>
+        <artifactId>jsonassert</artifactId>
+        <version>1.5.1</version>
+        <scope>test</scope>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-replication</artifactId>

From 91cfd47b27fb46b43eabca4c0cfab1b07a054d9f Mon Sep 17 00:00:00 2001
From: Yiwei Li <yiweili6@illinois.edu>
Date: Tue, 15 Nov 2022 21:42:45 -0600
Subject: [PATCH 3/4] HBASE-27479 fix issue

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 3467270abd05..6549b25a10ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1022,6 +1022,7 @@
         <artifactId>jsonassert</artifactId>
         <version>1.5.1</version>
         <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-replication</artifactId>

From d355e4c645242a8dd9f552a291cbfb00ac77494d Mon Sep 17 00:00:00 2001
From: Yiwei Li <yiweili6@illinois.edu>
Date: Tue, 15 Nov 2022 22:10:14 -0600
Subject: [PATCH 4/4] HBASE-27479 fix issue

---
 .../hadoop/hbase/monitoring/TestTaskMonitor.java    |  4 ++--
 pom.xml                                             | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index 671fa135acac..17a998a11643 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -239,8 +239,8 @@ public void testClone() throws Exception {
     assertEquals(clone.getStatus(), monitor.getStatus());
     assertEquals(clone.toString(), monitor.toString());
     assertEquals(clone.toMap(), monitor.toMap());
-    JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(),true);
-    
+    JSONAssert.assertEquals(clone.toJSON(), monitor.toJSON(), true);
+
     // mark complete and make param dirty
     monitor.markComplete("complete RPC");
     testParam.setParam("dirtyParam");
diff --git a/pom.xml b/pom.xml
index 6549b25a10ef..8d077868fef8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -827,6 +827,7 @@
     <jcodings.version>1.0.56</jcodings.version>
     <spy.version>2.12.2</spy.version>
     <bouncycastle.version>1.70</bouncycastle.version>
+    <skyscreamer.version>1.5.1</skyscreamer.version>
     <kerby.version>1.0.1</kerby.version>
     <commons-crypto.version>1.1.0</commons-crypto.version>
     <curator.version>4.2.0</curator.version>
@@ -1017,12 +1018,6 @@
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.skyscreamer</groupId>
-        <artifactId>jsonassert</artifactId>
-        <version>1.5.1</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.apache.hbase</groupId>
         <artifactId>hbase-replication</artifactId>
@@ -1576,6 +1571,12 @@
         <version>${bouncycastle.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.skyscreamer</groupId>
+        <artifactId>jsonassert</artifactId>
+        <version>${skyscreamer.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcpkix-jdk15on</artifactId>