From 896563ab5f32226aa322c1f5dfd31a9e3e77668b Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Tue, 18 Mar 2014 17:14:10 +0000
Subject: [PATCH] HBASE-10779 Doc hadoop1 deprecated in 0.98 and NOT supported
 in hbase 1.0

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1578970 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                           |  2 +-
 src/main/docbkx/configuration.xml | 36 ++++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 29f6716ece1..a2b18fb6911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -770,7 +770,7 @@
       <plugin>
         <groupId>com.agilejava.docbkx</groupId>
         <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.14</version>
+        <version>2.0.15</version>
         <inherited>false</inherited>
         <dependencies>
           <dependency>
diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index 9e648d874b9..a7bb30df5a7 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -233,23 +233,30 @@ needed for servers to pick up changes (caveat dynamic config. to be described la
              <tip><title>Hadoop 2.x is better than Hadoop 1.x</title>
                  <para>Hadoop 2.x is faster, with more features such as short-circuit reads which will help improve your
                      HBase random read profile as well important bug fixes that will improve your overall HBase experience.
-                     You should run Hadoop 2. rather than Hadoop 1. if you can.
+                     You should run Hadoop 2 rather than Hadoop 1. HBase 0.98 deprecates use of Hadoop1.
+                     HBase 1.0 will not support Hadoop1.
              </para>
          </tip>
 	     <table>
 		 <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'/>
+		 <tgroup cols='6' 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'/>
+                   <colspec colname='c5' align='center'/>
+                   <colspec colname='c6' align='center'/>
          <thead>
-         <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>
+         <row><entry>               </entry><entry>HBase-0.92.x</entry><entry>HBase-0.94.x</entry><entry>HBase-0.96.x</entry><entry>HBase-0.98.x<footnote><para>Support for Hadoop 1.x is deprecated.</para></footnote></entry><entry>HBase-1.0.x<footnote><para>Hadoop 1.x is NOT supported</para></footnote></entry></row>
 	     </thead><tbody>
-          <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-0.20.205</entry><entry>S</entry>          <entry>X</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><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>X</entry>          <entry>X</entry>           <entry>X</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><entry>X</entry></row>
+          <row><entry>Hadoop-1.1.x   </entry><entry>NT</entry>         <entry>S</entry>           <entry>S</entry><entry>X</entry><entry>X</entry></row>
+          <row><entry>Hadoop-0.23.x  </entry><entry>X</entry>          <entry>S</entry>           <entry>NT</entry><entry>X</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><entry>X</entry></row>
+          <row><entry>Hadoop-2.1.0-beta     </entry><entry>X</entry>          <entry>NT</entry>           <entry>S</entry><entry>X</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 +285,11 @@ Index: pom.xml
          <slf4j.version>1.6.1</slf4j.version>
        </properties>
        <dependencies>]]></programlisting>
-          </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>
+          </para></footnote></entry>           <entry>S</entry><entry>S</entry><entry>NT</entry></row>
+          <row><entry>Hadoop-2.3.x</entry><entry>X</entry>          <entry>NT</entry>           <entry>S</entry><entry>S</entry><entry>NT</entry></row>
+          <row><entry>Hadoop-2.4.x</entry><entry>X</entry>          <entry>NT</entry>           <entry>S</entry><entry>S</entry><entry>S</entry></row>
+          <row><entry>Hadoop-2.5.x</entry><entry>X</entry>          <entry>NT</entry>           <entry>S</entry><entry>S</entry><entry>S</entry></row>
+
 		 </tbody></tgroup></table>
 
         Where