diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index df93763..5c53f40 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -158,7 +158,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -178,7 +178,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 4195d1e..585bd31 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -230,7 +230,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -241,7 +241,7 @@ - @@ -273,7 +273,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 2a16ca4..737a962 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -132,7 +132,7 @@ if we can combine these profiles somehow --> - !hadoop.profile + hadoop.profile1.1 @@ -155,7 +155,7 @@ if we can combine these profiles somehow --> - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 5fa1288..e48a874 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -219,7 +219,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -262,7 +262,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index a229f4d..ff7e97a 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -104,7 +104,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -138,7 +138,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index e66fc62..f3b8198 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -522,7 +522,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -564,7 +564,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index d4bf6af..6401632 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -282,7 +282,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -324,7 +324,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index e790001..9c9e876 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -121,7 +121,7 @@ - !hadoop.profile + hadoop.profile1.1 @@ -167,7 +167,7 @@ - hadoop.profile2.0 + !hadoop.profile @@ -253,4 +253,4 @@ - \ No newline at end of file + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 22072f9..f4479da 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -223,7 +223,7 @@ the same time. --> - !hadoop.profile + hadoop.profile1.1 @@ -266,7 +266,7 @@ the same time. --> - hadoop.profile2.0 + !hadoop.profile diff --git a/pom.xml b/pom.xml index a363696..f3cea2f 100644 --- a/pom.xml +++ b/pom.xml @@ -1472,14 +1472,15 @@ profiles with activation properties matching the profile here. Generally, it should be sufficient to copy the first few lines of the profile you want to match. --> - + hadoop-1.1 - !hadoop.profile + hadoop.profile1.1 + < hbase-hadoop1-compat @@ -1531,6 +1532,7 @@ + hadoop-1.0 @@ -1597,7 +1599,7 @@ - hadoop.profile2.0 + !hadoop.profile diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml index 9559a66..994bf12 100644 --- a/src/main/docbkx/configuration.xml +++ b/src/main/docbkx/configuration.xml @@ -240,16 +240,16 @@ needed for servers to pick up changes (caveat dynamic config. to be described la Hadoop version support matrix - HBase-0.92.xHBase-0.94.xHBase-0.96.0 + HBase-0.92.xHBase-0.94.xHBase-0.96.0HBase-0.98.0 - Hadoop-0.20.205S X X - Hadoop-0.22.x S X X - Hadoop-1.0.0-1.0.2HBase requires hadoop 1.0.3 at a minimum; there is an issue where we cannot find KerberosUtil compiling against earlier versions of Hadoop. S S X - Hadoop-1.0.3+S S S - Hadoop-1.1.x NT S S - Hadoop-0.23.x X S NT - Hadoop-2.0.x-alpha X NT X - Hadoop-2.1.0-beta X NT S + Hadoop-0.20.205S X XX + Hadoop-0.22.x S X XX + Hadoop-1.0.0-1.0.2HBase requires hadoop 1.0.3 at a minimum; there is an issue where we cannot find KerberosUtil compiling against earlier versions of Hadoop. S S XX + Hadoop-1.0.3+S S SX + Hadoop-1.1.x NT S SX + Hadoop-0.23.x X S NTX + Hadoop-2.0.x-alpha X NT XX + Hadoop-2.1.0-beta X NT SX Hadoop-2.2.0 X NTTo get 0.94.x to run on hadoop 2.2.0, you need to change the hadoop 2 and protobuf versions in the pom.xml and then build against the hadoop 2 profile by running something like the following command: @@ -278,8 +278,8 @@ Index: pom.xml 1.6.1 ]]> - S - Hadoop-2.x X NT S + SS + Hadoop-2.x X NT SS Where