diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index bee264ef866..ef0d1cdedb6 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -143,6 +143,8 @@ 1.5.4 1.16 + 1.2.6 + 2.0.0-beta-1 @@ -1361,6 +1363,11 @@ 3.8.0 test + + org.jruby.jcodings + jcodings + 1.0.13 + @@ -1840,9 +1847,9 @@ - 1.2.6 + ${hbase.one.version} 2.5.1 - 11.0.2 + 12.0.1 hadoop-yarn-server-timelineservice-hbase-server-1 @@ -1867,7 +1874,7 @@ - 2.0.0-beta-1 + ${hbase.two.version} 3.0.0 11.0.2 hadoop-yarn-server-timelineservice-hbase-server-2 @@ -1879,11 +1886,6 @@ ${hbase-server-artifactid} ${project.version} - - org.jruby.jcodings - jcodings - 1.0.13 - 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 df7c5e3f069..79fc8610491 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 @@ -33,36 +33,15 @@ ${project.parent.parent.parent.parent.basedir} + + ${hbase.one.version} - default - - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-compile - none - - - - - - - - hbase1 - - !hbase.profile - + true 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 0b2cb2fed61..77a4add1de6 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 @@ -33,37 +33,15 @@ ${project.parent.parent.parent.parent.basedir} + + ${hbase.two.version} - default - - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-compile - none - - - - - - - - hbase2 - - hbase.profile - 2.0 - + true