[4/4] hadoop git commit: YARN-7346. Add a profile to allow optional compilation for ATSv2 with HBase-2.0. Contributed by Haibo Chen and Rohith.
YARN-7346. Add a profile to allow optional compilation for ATSv2 with HBase-2.0. Contributed by Haibo Chen and Rohith. (cherry picked from commit 55ba49dd071b66e72c47a1c41e88b9a5feddf53b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f527ff05 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f527ff05 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f527ff05 Branch: refs/heads/YARN-7055 Commit: f527ff0559f8f8b3cc64a477605ce977e1db5060 Parents: 2e887bc Author: Rohith Sharma K SAuthored: Tue Mar 6 10:42:03 2018 +0530 Committer: Rohith Sharma K S Committed: Wed Mar 7 10:20:47 2018 +0530 -- .../resources/assemblies/hadoop-yarn-dist.xml | 2 +- hadoop-project/pom.xml | 70 +- .../pom.xml | 78 +- .../storage/flow/TestHBaseStorageFlowRun.java | 19 +- .../flow/TestHBaseStorageFlowRunCompaction.java | 103 +-- .../pom.xml | 6 +- .../pom.xml | 165 + .../src/assembly/coprocessor.xml| 38 + .../common/HBaseTimelineServerUtils.java| 222 ++ .../storage/common/package-info.java| 28 + .../storage/flow/FlowRunCoprocessor.java| 278 +++ .../storage/flow/FlowScanner.java | 723 +++ .../storage/flow/FlowScannerOperation.java | 46 ++ .../storage/flow/package-info.java | 29 + .../timelineservice/storage/package-info.java | 28 + .../pom.xml | 172 + .../src/assembly/coprocessor.xml| 38 + .../common/HBaseTimelineServerUtils.java| 224 ++ .../storage/common/package-info.java| 28 + .../storage/flow/FlowRunCoprocessor.java| 285 .../storage/flow/FlowScanner.java | 723 +++ .../storage/flow/FlowScannerOperation.java | 46 ++ .../storage/flow/package-info.java | 29 + .../timelineservice/storage/package-info.java | 28 + .../pom.xml | 184 ++--- .../src/assembly/coprocessor.xml| 37 - .../common/HBaseTimelineServerUtils.java| 135 .../storage/common/package-info.java| 28 - .../storage/flow/FlowRunCoprocessor.java| 277 --- .../storage/flow/FlowScanner.java | 723 --- .../storage/flow/FlowScannerOperation.java | 46 -- .../storage/flow/package-info.java | 29 - .../timelineservice/storage/package-info.java | 28 - 33 files changed, 3375 insertions(+), 1520 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f527ff05/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml -- 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 2c266b6..382c967 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:${hbase-server-artifactid} share/hadoop/${hadoop.component}/timelineservice http://git-wip-us.apache.org/repos/asf/hadoop/blob/f527ff05/hadoop-project/pom.xml -- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index b72e497..20a4628 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -49,9 +49,6 @@ 2.11.0 0.8.2.1 -1.2.6 -2.5.1 -11.0.2 ${project.version} 1.0.13 @@ -146,6 +143,8 @@ 1.5.4 1.16 +1.2.6 +2.0.0-beta-1 @@ -407,12 +406,6 @@ ${project.version} - -org.apache.hadoop - hadoop-yarn-server-timelineservice-hbase-server -${project.version} - - org.apache.hadoop hadoop-yarn-applications-distributedshell @@ -666,7 +659,6 @@ jsp-api 2.1 - org.glassfish javax.servlet @@ -1371,6 +1363,11 @@ 3.8.0 test + +org.jruby.jcodings +jcodings +1.0.13 + @@ -1839,6 +1836,59 @@ + + + hbase1 + + + !hbase.profile + + + +${hbase.one.version} + 2.5.1 +12.0.1 +
[4/4] hadoop git commit: YARN-7346. Add a profile to allow optional compilation for ATSv2 with HBase-2.0. Contributed by Haibo Chen and Rohith.
YARN-7346. Add a profile to allow optional compilation for ATSv2 with HBase-2.0. Contributed by Haibo Chen and Rohith. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55ba49dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55ba49dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55ba49dd Branch: refs/heads/trunk Commit: 55ba49dd071b66e72c47a1c41e88b9a5feddf53b Parents: 745190e Author: Rohith Sharma K SAuthored: Tue Mar 6 10:42:03 2018 +0530 Committer: Rohith Sharma K S Committed: Tue Mar 6 11:55:21 2018 +0530 -- .../resources/assemblies/hadoop-yarn-dist.xml | 2 +- hadoop-project/pom.xml | 70 +- .../pom.xml | 78 +- .../storage/flow/TestHBaseStorageFlowRun.java | 19 +- .../flow/TestHBaseStorageFlowRunCompaction.java | 103 +-- .../pom.xml | 6 +- .../pom.xml | 165 + .../src/assembly/coprocessor.xml| 38 + .../common/HBaseTimelineServerUtils.java| 222 ++ .../storage/common/package-info.java| 28 + .../storage/flow/FlowRunCoprocessor.java| 278 +++ .../storage/flow/FlowScanner.java | 723 +++ .../storage/flow/FlowScannerOperation.java | 46 ++ .../storage/flow/package-info.java | 29 + .../timelineservice/storage/package-info.java | 28 + .../pom.xml | 172 + .../src/assembly/coprocessor.xml| 38 + .../common/HBaseTimelineServerUtils.java| 224 ++ .../storage/common/package-info.java| 28 + .../storage/flow/FlowRunCoprocessor.java| 285 .../storage/flow/FlowScanner.java | 723 +++ .../storage/flow/FlowScannerOperation.java | 46 ++ .../storage/flow/package-info.java | 29 + .../timelineservice/storage/package-info.java | 28 + .../pom.xml | 184 ++--- .../src/assembly/coprocessor.xml| 37 - .../common/HBaseTimelineServerUtils.java| 135 .../storage/common/package-info.java| 28 - .../storage/flow/FlowRunCoprocessor.java| 277 --- .../storage/flow/FlowScanner.java | 723 --- .../storage/flow/FlowScannerOperation.java | 46 -- .../storage/flow/package-info.java | 29 - .../timelineservice/storage/package-info.java | 28 - 33 files changed, 3375 insertions(+), 1520 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ba49dd/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml -- 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 2c266b6..382c967 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:${hbase-server-artifactid} share/hadoop/${hadoop.component}/timelineservice http://git-wip-us.apache.org/repos/asf/hadoop/blob/55ba49dd/hadoop-project/pom.xml -- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index e84c6be..ef0d1cd 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -49,9 +49,6 @@ 2.11.0 0.8.2.1 -1.2.6 -2.5.1 -11.0.2 ${project.version} 1.0.13 @@ -146,6 +143,8 @@ 1.5.4 1.16 +1.2.6 +2.0.0-beta-1 @@ -407,12 +406,6 @@ ${project.version} - -org.apache.hadoop - hadoop-yarn-server-timelineservice-hbase-server -${project.version} - - org.apache.hadoop hadoop-yarn-applications-distributedshell @@ -666,7 +659,6 @@ jsp-api 2.1 - org.glassfish javax.servlet @@ -1371,6 +1363,11 @@ 3.8.0 test + +org.jruby.jcodings +jcodings +1.0.13 + @@ -1839,6 +1836,59 @@ + + + hbase1 + + + !hbase.profile + + + +${hbase.one.version} + 2.5.1 +12.0.1 + hadoop-yarn-server-timelineservice-hbase-server-1 + + + + +