Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9955 Make hadoop2 the default and deprecate hadoop1 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1548349 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-12-06 01:10:59 +00:00
parent 66bafba4e1
commit 7fbe97470e
10 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-common/pom.xml
View File

@ -230,7 +230,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -241,7 +241,7 @@
</dependencies>
</profile>
<!-- profile against Hadoop 1.0.x:
<!-- profile against Hadoop 1.0.x:
mvn -Dhadoop.profile=1.0
-->
<profile>
@ -273,7 +273,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
hbase-examples/pom.xml
View File

@ -132,7 +132,7 @@ if we can combine these profiles somehow -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -155,7 +155,7 @@ if we can combine these profiles somehow -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
hbase-it/pom.xml
View File

@ -219,7 +219,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -262,7 +262,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
hbase-prefix-tree/pom.xml
View File

@ -104,7 +104,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -138,7 +138,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
hbase-server/pom.xml
View File

@ -522,7 +522,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -564,7 +564,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
hbase-shell/pom.xml
View File

@ -282,7 +282,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -324,7 +324,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

6
hbase-testing-util/pom.xml
View File

@ -121,7 +121,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -167,7 +167,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>
@ -253,4 +253,4 @@
</dependencies>
</profile>
</profiles>
</project>
</project>

4
hbase-thrift/pom.xml
View File

@ -223,7 +223,7 @@ the same time. -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<dependencies>
@ -266,7 +266,7 @@ the same time. -->
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<dependencies>

4
pom.xml
View File

@ -1487,7 +1487,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h1--><name>!hadoop.profile</name>
<!--h1--><name>hadoop.profile</name><value>1.1</value>
</property>
</activation>
<modules>
@ -1606,7 +1606,7 @@
<activation>
<property>
<!--Below formatting for dev-support/generate-hadoopX-poms.sh-->
<!--h2--><name>hadoop.profile</name><value>2.0</value>
<!--h2--><name>!hadoop.profile</name>
</property>
</activation>
<modules>

22
src/main/docbkx/configuration.xml
View File

@ -240,16 +240,16 @@ needed for servers to pick up changes (caveat dynamic config. to be described la
<title>Hadoop version support matrix</title>
<tgroup cols='4' align='left' colsep='1' rowsep='1'><colspec colname='c1' align='left'/><colspec colname='c2' align='center'/><colspec colname='c3' align='center'/><colspec colname='c4' align='center'/>
<thead>
<row><entry> </entry><entry>HBase-0.92.x</entry><entry>HBase-0.94.x</entry><entry>HBase-0.96.0</entry></row>
<row><entry> </entry><entry>HBase-0.92.x</entry><entry>HBase-0.94.x</entry><entry>HBase-0.96.0</entry><entry>HBase-0.98.0</entry></row>
</thead><tbody>
<row><entry>Hadoop-0.20.205</entry><entry>S</entry> <entry>X</entry> <entry>X</entry></row>
<row><entry>Hadoop-0.22.x </entry><entry>S</entry> <entry>X</entry> <entry>X</entry></row>
<row><entry>Hadoop-1.0.0-1.0.2<footnote><para>HBase requires hadoop 1.0.3 at a minimum; there is an issue where we cannot find KerberosUtil compiling against earlier versions of Hadoop.</para></footnote> </entry><entry>S</entry> <entry>S</entry> <entry>X</entry></row>
<row><entry>Hadoop-1.0.3+</entry><entry>S</entry> <entry>S</entry> <entry>S</entry></row>
<row><entry>Hadoop-1.1.x </entry><entry>NT</entry> <entry>S</entry> <entry>S</entry></row>
<row><entry>Hadoop-0.23.x </entry><entry>X</entry> <entry>S</entry> <entry>NT</entry></row>
<row><entry>Hadoop-2.0.x-alpha </entry><entry>X</entry> <entry>NT</entry> <entry>X</entry></row>
<row><entry>Hadoop-2.1.0-beta </entry><entry>X</entry> <entry>NT</entry> <entry>S</entry></row>
<row><entry>Hadoop-0.20.205</entry><entry>S</entry> <entry>X</entry> <entry>X</entry><entry>X</entry></row>
<row><entry>Hadoop-0.22.x </entry><entry>S</entry> <entry>X</entry> <entry>X</entry><entry>X</entry></row>
<row><entry>Hadoop-1.0.0-1.0.2<footnote><para>HBase requires hadoop 1.0.3 at a minimum; there is an issue where we cannot find KerberosUtil compiling against earlier versions of Hadoop.</para></footnote> </entry><entry>S</entry> <entry>S</entry> <entry>X</entry><entry>X</entry></row>
<row><entry>Hadoop-1.0.3+</entry><entry>S</entry> <entry>S</entry> <entry>S</entry><entry>X</entry></row>
<row><entry>Hadoop-1.1.x </entry><entry>NT</entry> <entry>S</entry> <entry>S</entry><entry>X</entry></row>
<row><entry>Hadoop-0.23.x </entry><entry>X</entry> <entry>S</entry> <entry>NT</entry><entry>X</entry></row>
<row><entry>Hadoop-2.0.x-alpha </entry><entry>X</entry> <entry>NT</entry> <entry>X</entry><entry>X</entry></row>
<row><entry>Hadoop-2.1.0-beta </entry><entry>X</entry> <entry>NT</entry> <entry>S</entry><entry>X</entry></row>
<row><entry>Hadoop-2.2.0 </entry><entry>X</entry> <entry>NT<footnote><para>To get 0.94.x to run on hadoop 2.2.0,
you need to change the hadoop 2 and protobuf versions in the <filename>pom.xml</filename> and then
build against the hadoop 2 profile by running something like the following command:
@ -278,8 +278,8 @@ Index: pom.xml
<slf4j.version>1.6.1</slf4j.version>
</properties>
<dependencies>]]></programlisting>
</para></footnote></entry> <entry>S</entry></row>
<row><entry>Hadoop-2.x </entry><entry>X</entry> <entry>NT</entry> <entry>S</entry></row>
</para></footnote></entry> <entry>S</entry><entry>S</entry></row>
<row><entry>Hadoop-2.x </entry><entry>X</entry> <entry>NT</entry> <entry>S</entry><entry>S</entry></row>
</tbody></tgroup></table>
Where