From 92179b8afe3c9d26cf2df169321ae3b4bcfbacbc Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Tue, 24 Jun 2014 17:08:20 -0700
Subject: [PATCH] HBASE-11102 Document JDK versions supported by each release
 (Misty Stanley-Jones)

---
 src/main/docbkx/configuration.xml   | 47 +++++++++++++++++++++++++++--
 src/main/docbkx/getting_started.xml |  5 +++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/main/docbkx/configuration.xml b/src/main/docbkx/configuration.xml
index 00effab1364..1d257b95f81 100644
--- a/src/main/docbkx/configuration.xml
+++ b/src/main/docbkx/configuration.xml
@@ -59,8 +59,51 @@
     <section
       xml:id="java">
       <title>Java</title>
-      <para>Just like Hadoop, HBase requires at least Java 6 from <link
-          xlink:href="http://www.java.com/download/">Oracle</link>. </para>
+      <para>HBase requires at least Java 6 from <link
+          xlink:href="http://www.java.com/download/">Oracle</link>. The following table lists which JDK version are
+        compatible with each version of HBase.</para>
+      <informaltable>
+        <tgroup cols="4">
+          <thead>
+            <row>
+              <entry>HBase Version</entry>
+              <entry>JDK 6</entry>
+              <entry>JDK 7</entry>
+              <entry>JDK 8</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>1.0</entry>
+              <entry>yes</entry>
+              <entry>yes</entry>
+              <entry><para>Running with JDK 8 will work but is not well tested.</para></entry>
+            </row>
+            <row>
+              <entry>0.98</entry>
+              <entry>yes</entry>
+              <entry>yes</entry>
+              <entry><para>Running with JDK 8 works but is not well tested. Building with JDK 8
+                would require removal of the deprecated remove() method of the PoolMap class and is
+                under consideration. See ee <link
+                xlink:href="https://issues.apache.org/jira/browse/HBASE-7608">HBASE-7608</link> for
+                more information about JDK 8 support.</para></entry>
+            </row>
+            <row>
+              <entry>0.96</entry>
+              <entry>yes</entry>
+              <entry>yes</entry>
+              <entry></entry>
+            </row>
+            <row>
+              <entry>0.94</entry>
+              <entry>yes</entry>
+              <entry>yes</entry>
+              <entry></entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
     </section>
 
     <section
diff --git a/src/main/docbkx/getting_started.xml b/src/main/docbkx/getting_started.xml
index 54ba4afd31f..117e1ec3546 100644
--- a/src/main/docbkx/getting_started.xml
+++ b/src/main/docbkx/getting_started.xml
@@ -82,6 +82,11 @@
 
     </note>
 
+    <section>
+      <title>JDK Version Requirements</title>
+      <para>HBase requires that a JDK be installed. See <xref linkend="java" /> for information
+        about supported JDK versions.</para>
+    </section>
 
     <section>
       <title>Download and unpack the latest stable release.</title>