You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/06/11 04:56:33 UTC

[47/50] hbase git commit: HBASE-15925 provide default values for hadoop compat module related properties that match default hadoop profile.

HBASE-15925 provide default values for hadoop compat module related properties that match default hadoop profile.

Signed-off-by: Mikhail Antonov <an...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/108d39a7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/108d39a7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/108d39a7

Branch: refs/heads/hbase-12439
Commit: 108d39a7277bdcbc8b4bc9c50bab457a86a71971
Parents: 55a04b7
Author: Sean Busbey <bu...@apache.org>
Authored: Thu Jun 9 13:30:45 2016 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Thu Jun 9 16:29:28 2016 -0500

----------------------------------------------------------------------
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/108d39a7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6652b78..0e33ae8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1212,6 +1212,13 @@
     <!-- Dependencies -->
     <hadoop-two.version>2.7.1</hadoop-two.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 -->