diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
index 6481b7abaed..382c9672631 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
@@ -236,7 +236,7 @@
- org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server-1
+ org.apache.hadoop:${hbase-server-artifactid}
share/hadoop/${hadoop.component}/timelineservice
@@ -247,19 +247,6 @@
hadoop-yarn-server-timelineservice-hbase-coprocessor-${module.version}.${module.extension}
-
-
-
-
-
-
-
-
-
-
-
-
-
org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-tests
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 8621b9734cc..dfbfead7009 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -1836,12 +1836,13 @@
1.2.6
2.5.1
11.0.2
+ hadoop-yarn-server-timelineservice-hbase-server-1
org.apache.hadoop
- hadoop-yarn-server-timelineservice-hbase-server-1
+ ${hbase-server-artifactid}
${project.version}
@@ -1863,12 +1864,13 @@
2.0.0-beta-1
3.0.0
11.0.2
+ hadoop-yarn-server-timelineservice-hbase-server-2
org.apache.hadoop
- hadoop-yarn-server-timelineservice-hbase-server-2
+ ${hbase-server-artifactid}
${project.version}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index 2b05388b76a..2c8d5dd2412 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -27,7 +27,7 @@
4.0.0
hadoop-yarn-server-timelineservice-hbase-tests
3.2.0-SNAPSHOT
- Apache Hadoop YARN Timeline Service HBase tests
+ Apache Hadoop YARN TimelineService HBase tests
diff --git a/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 b/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 9d3ef90e5a1..c94a98bc0dd 100644
--- a/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
+++ b/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
@@ -35,6 +35,35 @@
${project.parent.parent.parent.parent.basedir}
+
+
+ default
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ default-compile
+ none
+
+
+
+
+
+
+
+
+ hbase1
+
+
+ !hbase.profile
+
+
org.apache.hadoop
@@ -152,4 +181,6 @@
+
+
\ No newline at end of file
diff --git a/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 b/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 857e4acf05f..0b2cb2fed61 100644
--- a/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
+++ b/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
@@ -35,128 +35,160 @@
${project.parent.parent.parent.parent.basedir}
-
-
- org.apache.hadoop
- hadoop-yarn-server-timelineservice-hbase-common
-
-
-
- org.slf4j
- slf4j-api
-
-
-
- com.google.guava
- guava
-
-
-
- org.apache.hadoop
- hadoop-annotations
- provided
-
-
-
- org.apache.hadoop
- hadoop-common
- provided
-
-
-
- org.apache.hadoop
- hadoop-yarn-api
- provided
-
-
-
- org.apache.hbase
- hbase-common
-
-
- org.apache.hadoop
- hadoop-mapreduce-client-core
-
-
- org.mortbay.jetty
- jetty-util
-
-
-
-
-
- org.apache.hbase
- hbase-client
-
-
- org.apache.hadoop
- hadoop-mapreduce-client-core
-
-
-
-
-
-
- org.jruby.jcodings
- jcodings
-
-
-
- org.apache.hbase
- hbase-server
- provided
-
-
+
+
+ default
+
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ default-compile
+ none
+
+
+
+
+
+
+
+
+ hbase2
+
+
+ hbase.profile
+ 2.0
+
+
+
+
org.apache.hadoop
- hadoop-hdfs
-
-
+ hadoop-yarn-server-timelineservice-hbase-common
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+ com.google.guava
+ guava
+
+
+
org.apache.hadoop
- hadoop-hdfs-client
-
-
+ hadoop-annotations
+ provided
+
+
+
org.apache.hadoop
- hadoop-client
-
-
+ hadoop-common
+ provided
+
+
+
org.apache.hadoop
- hadoop-mapreduce-client-core
-
-
- org.mortbay.jetty
- jetty
-
-
- org.mortbay.jetty
- jetty-util
-
-
- org.mortbay.jetty
- jetty-sslengine
-
-
-
-
-
-
-
-
- maven-assembly-plugin
-
- src/assembly/coprocessor.xml
- true
-
-
-
- create-coprocessor-jar
- prepare-package
-
- single
-
-
-
-
-
-
+ hadoop-yarn-api
+ provided
+
+
+
+ org.apache.hbase
+ hbase-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+ org.mortbay.jetty
+ jetty-util
+
+
+
+
+
+ org.apache.hbase
+ hbase-client
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+
+
+
+
+ org.jruby.jcodings
+ jcodings
+
+
+
+ org.apache.hbase
+ hbase-server
+ provided
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+
+
+ org.apache.hadoop
+ hadoop-hdfs-client
+
+
+ org.apache.hadoop
+ hadoop-client
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+ org.mortbay.jetty
+ jetty
+
+
+ org.mortbay.jetty
+ jetty-util
+
+
+ org.mortbay.jetty
+ jetty-sslengine
+
+
+
+
+
+
+
+
+ maven-assembly-plugin
+
+
+ create-coprocessor-jar
+ prepare-package
+
+ single
+
+
+ src/assembly/coprocessor.xml
+ true
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/pom.xml
index 160d376412c..3ca443f81b5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase/hadoop-yarn-server-timelineservice-hbase-server/pom.xml
@@ -28,7 +28,7 @@
hadoop-yarn-server-timelineservice-hbase-server
3.2.0-SNAPSHOT
- Apache Hadoop YARN Timeline Service HBase Servers
+ Apache Hadoop YARN TimelineService HBase Servers
pom