Repository: hbase Updated Branches: refs/heads/branch-1 a4e2b3856 -> e6a46bbb8 refs/heads/branch-1.1 bccedc607 -> 737b1d6de refs/heads/branch-1.2 8dc366878 -> f245fe106 refs/heads/branch-1.3 d320ac28e -> c9d4ee8b4
HBASE-15925 provide default values for hadoop compat module related properties that match default hadoop profile. Signed-off-by: Mikhail Antonov <anto...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e6a46bbb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e6a46bbb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e6a46bbb Branch: refs/heads/branch-1 Commit: e6a46bbb8dc12e85381803325cad3c25b21b6ba9 Parents: a4e2b38 Author: Sean Busbey <bus...@apache.org> Authored: Thu Jun 9 13:30:45 2016 -0500 Committer: Sean Busbey <bus...@apache.org> Committed: Thu Jun 9 16:31:03 2016 -0500 ---------------------------------------------------------------------- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e6a46bbb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e6bf6d9..2424ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -1130,6 +1130,13 @@ <!-- minikdc introduced in hadoop-2.3; override when building earlier versions --> <hadoop-two-minikdc.version>${hadoop-two.version}</hadoop-two-minikdc.version> <hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version> + <!-- These must be defined here for downstream build tools that don't look at profiles. + They ought to match the values found in our default hadoop profile, which is + currently "hadoop-2.0". See HBASE-15925 for more info. --> + <hadoop.version>${hadoop-two.version}</hadoop.version> + <compat.module>hbase-hadoop2-compat</compat.module> + <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file> + <!-- end HBASE-15925 default hadoop compatibility values --> <commons-cli.version>1.2</commons-cli.version> <commons-codec.version>1.9</commons-codec.version> <!-- pretty outdated -->
