diff --git hadoop-project/pom.xml hadoop-project/pom.xml
index 8e28afe..b2593b0 100644
--- hadoop-project/pom.xml
+++ hadoop-project/pom.xml
@@ -152,7 +152,9 @@
1.5.4
1.16
1.2.6
+ 1.2.6
2.0.0-beta-1
+ 2.0.0-beta-1
@@ -1437,8 +1439,8 @@
org.apache.hbase
- hbase-client
- ${hbase.version}
+ hbase-shaded-client
+ ${hbase-shaded.version}
@@ -2015,6 +2017,7 @@
${hbase.one.version}
+ ${hbase-shaded.one.version}
2.5.1
12.0.1
hadoop-yarn-server-timelineservice-hbase-server-1
@@ -2042,6 +2045,7 @@
${hbase.two.version}
+ ${hbase-shaded.two.version}
3.0.0
11.0.2
hadoop-yarn-server-timelineservice-hbase-server-2
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index 05a5c65..5ae7d85 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -191,7 +191,8 @@
org.apache.hbase
- hbase-client
+ hbase-shaded-client
+ ${hbase-shaded.version}
test
@@ -212,6 +213,7 @@
org.apache.hbase
hbase-server
+ ${hbase.version}
test
@@ -248,6 +250,7 @@
org.apache.hbase
hbase-server
+ ${hbase.version}
tests
test
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
index 839b9a0..f54da27 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-client/pom.xml
@@ -114,7 +114,7 @@
org.apache.hbase
- hbase-client
+ hbase-shaded-client
org.apache.hadoop
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
index 79fc861..18c9349 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-1/pom.xml
@@ -94,7 +94,7 @@
org.apache.hbase
- hbase-client
+ hbase-shaded-client
org.apache.hadoop
@@ -162,4 +162,4 @@
-
\ No newline at end of file
+
diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
index c9fe5d0..13a4686 100644
--- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
+++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/hadoop-yarn-server-timelineservice-hbase-server-2/pom.xml
@@ -94,7 +94,7 @@
org.apache.hbase
- hbase-client
+ hbase-shaded-client
org.apache.hadoop
@@ -173,4 +173,4 @@
-
\ No newline at end of file
+