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 2c266b617fb..6481b7abaed 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 + org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server-1 share/hadoop/${hadoop.component}/timelineservice @@ -247,6 +247,19 @@ 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 f577599c516..97e83ac9ad6 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -33,7 +33,6 @@ 2018 - 3.2.0-SNAPSHOT false true 9.3.19.v20170502 @@ -50,12 +49,8 @@ 2.11.0 0.8.2.1 - 1.2.6 - 2.5.1 - 11.0.2 - ${hadoop.version}-${hbase.version} - ${hadoop.version} + ${project.version} 1.0.13 ${project.build.directory}/test-dir @@ -144,7 +139,7 @@ 1.5 - ${hadoop.version} + ${project.version} 1.5.4 1.16 @@ -171,398 +166,392 @@ org.apache.hadoop hadoop-assemblies - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-annotations - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-client-modules - ${hadoop.version} + ${project.version} pom org.apache.hadoop hadoop-client-api - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-client-check-invariants - ${hadoop.version} + ${project.version} pom org.apache.hadoop hadoop-client-check-test-invariants - ${hadoop.version} + ${project.version} pom org.apache.hadoop hadoop-client-integration-tests - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-client-runtime - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-client-minicluster - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-common - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-common - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-auth - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-auth - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-nfs - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-hdfs - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-hdfs-client - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-hdfs - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-mapreduce-client-app - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-app - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-mapreduce-client-common - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-api - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-client - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-core - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-shuffle - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn - ${hadoop.version} + ${project.version} pom org.apache.hadoop hadoop-yarn-server - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-web-proxy - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-common - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-common - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-tests - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-common - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-common - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-registry - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-nodemanager - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-resourcemanager - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-resourcemanager - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-applicationhistoryservice - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-timelineservice - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-timelineservice - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-yarn-server-timelineservice-hbase-client - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-timelineservice-hbase-common - ${hadoop.version} - - - - org.apache.hadoop - hadoop-yarn-server-timelineservice-hbase-server - ${yarn-atsv2-coprocessor.version} + ${project.version} org.apache.hadoop hadoop-yarn-applications-distributedshell - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-timeline-pluginstorage - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-timeline-pluginstorage test-jar - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-server-router - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-yarn-services-core - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-client-jobclient - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-mapreduce-client-hs - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-mapreduce-examples - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-gridmix - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-streaming - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-archives - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-archive-logs - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-distcp - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-distcp - ${hadoop.version} + ${project.version} test-jar org.apache.hadoop hadoop-datajoin - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-rumen - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-extras - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-client - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-minicluster - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-minikdc - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-openstack - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-azure - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-aws - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-aliyun - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-kms - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-kms - ${hadoop.version} + ${project.version} test-jar @@ -1108,12 +1097,12 @@ org.apache.hadoop hadoop-sls - ${hadoop.version} + ${project.version} org.apache.hadoop hadoop-cloud-storage - ${hadoop.version} + ${project.version} com.google.code.findbugs @@ -1507,7 +1496,7 @@ org.apache.hadoop hadoop-maven-plugins - ${hadoop.version} + ${project.version} @@ -1536,14 +1525,14 @@ ${maven-remote-resources-plugin.version} - org.apache.hadoop:hadoop-build-tools:${hadoop.version} + org.apache.hadoop:hadoop-build-tools:${project.version} org.apache.hadoop hadoop-build-tools - ${hadoop.version} + ${project.version} @@ -1833,11 +1822,14 @@ + hbase1 - !withHBase2 + !hbase.profile @@ -1845,19 +1837,47 @@ 2.5.1 11.0.2 + + + + org.apache.hadoop + hadoop-yarn-server-timelineservice-hbase-server-1 + ${project.version} + + + + hbase2 - withHBase2 + hbase.profile + 2.0 2.0.0-beta-1 - 3.0.0-alpha4 + 3.0.0 11.0.2 + + + + org.apache.hadoop + hadoop-yarn-server-timelineservice-hbase-server-2 + ${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-tests/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml index dfd6f03e160..2b05388b76a 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 @@ -84,18 +84,6 @@ org.apache.hadoop - hadoop-yarn-server-timelineservice-hbase-server - test - - - org.apache.hadoop - hadoop-common - - - - - - org.apache.hadoop hadoop-common ${hbase-compatible-hadoop.version} test @@ -417,13 +405,47 @@ + hbase1 + + + !hbase.profile + + + + + org.apache.hadoop + hadoop-yarn-server-timelineservice-hbase-server-1 + test + + + org.apache.hadoop + hadoop-common + + + + + + + hbase2 - withHBase2 + hbase.profile + 2.0 + + org.apache.hadoop + hadoop-yarn-server-timelineservice-hbase-server-2 + test + + + org.apache.hadoop + hadoop-common + + + 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 bb0a31481ba..9d3ef90e5a1 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 @@ -20,15 +20,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hadoop-yarn-server-timelineservice-hbase-server-umbrella + hadoop-yarn-server-timelineservice-hbase-server org.apache.hadoop 3.2.0-SNAPSHOT 4.0.0 - hadoop-yarn-server-timelineservice-hbase-server - Apache Hadoop YARN TimelineService HBase Server - 3.2.0-SNAPSHOT-1.2.6 + hadoop-yarn-server-timelineservice-hbase-server-1 + Apache Hadoop YARN TimelineService HBase Server 1.2 + 3.2.0-SNAPSHOT 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/src/assembly/coprocessor.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/src/assembly/coprocessor.xml index da011a308b8..dd53bf22c22 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/src/assembly/coprocessor.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/src/assembly/coprocessor.xml @@ -31,7 +31,7 @@ runtime org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-common - org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server + org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server-1 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 28e5d09d425..857e4acf05f 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 @@ -20,15 +20,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - hadoop-yarn-server-timelineservice-hbase-server-umbrella + hadoop-yarn-server-timelineservice-hbase-server org.apache.hadoop 3.2.0-SNAPSHOT 4.0.0 - hadoop-yarn-server-timelineservice-hbase-server - Apache Hadoop YARN TimelineService HBase Server - 3.2.0-SNAPSHOT-2.0.0-beta-1 + hadoop-yarn-server-timelineservice-hbase-server-2 + Apache Hadoop YARN TimelineService HBase Server 2.0 + 3.2.0-SNAPSHOT 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/src/assembly/coprocessor.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/src/assembly/coprocessor.xml index da011a308b8..faadc1d6479 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/src/assembly/coprocessor.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/src/assembly/coprocessor.xml @@ -31,7 +31,7 @@ runtime org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-common - org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server + org.apache.hadoop:hadoop-yarn-server-timelineservice-hbase-server-2 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 a5714db990b..160d376412c 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 @@ -26,9 +26,9 @@ 4.0.0 - hadoop-yarn-server-timelineservice-hbase-server-umbrella + hadoop-yarn-server-timelineservice-hbase-server 3.2.0-SNAPSHOT - Apache Hadoop YARN Timeline Service HBase Server Umbrella + Apache Hadoop YARN Timeline Service HBase Servers pom @@ -36,7 +36,7 @@ hbase1 - !withHBase2 + !hbase.profile @@ -47,7 +47,8 @@ hbase2 - withHBase2 + hbase.profile + 2.0