From 17c869d54310889b300915de5cbe82163db1c35d Mon Sep 17 00:00:00 2001
From: Ted Yu <tedyu@apache.org>
Date: Tue, 5 Aug 2014 14:59:54 +0000
Subject: [PATCH] HBASE-11666 Enforce JDK7 javac for builds on branch-1 and
 master (Sean Busbey)

---
 bin/hbase-config.sh           | 2 +-
 conf/hbase-env.cmd            | 2 +-
 conf/hbase-env.sh             | 2 +-
 pom.xml                       | 2 +-
 src/main/docbkx/developer.xml | 7 +++++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index dea18819bf8..2bca169a57c 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -131,7 +131,7 @@ if [ -z "$JAVA_HOME" ]; then
 | Please download the latest Sun JDK from the Sun Java web site        |
 |       > http://java.sun.com/javase/downloads/ <                      |
 |                                                                      |
-| HBase requires Java 1.6 or later.                                    |
+| HBase requires Java 1.7 or later.                                    |
 | NOTE: This script will find Sun Java whether you install using the   |
 |       binary or the RPM based installer.                             |
 +======================================================================+
diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index eb703783bbb..26570dbfb28 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -18,7 +18,7 @@
 
 @rem Set environment variables here.
 
-@rem The java implementation to use.  Java 1.6 required.
+@rem The java implementation to use.  Java 1.7+ required.
 @rem set JAVA_HOME=c:\apps\java
 
 @rem Extra Java CLASSPATH elements.  Optional.
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index 9059d12e27e..2d10609b99c 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -25,7 +25,7 @@
 # so try to keep things idempotent unless you want to take an even deeper look
 # into the startup scripts (bin/hbase, etc.)
 
-# The java implementation to use.  Java 1.6 required.
+# The java implementation to use.  Java 1.7+ required.
 # export JAVA_HOME=/usr/java/jdk1.6.0/
 
 # Extra Java CLASSPATH elements.  Optional.
diff --git a/pom.xml b/pom.xml
index 379ae0b2fa3..997b0134b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -899,7 +899,7 @@
       yyyy-MM-dd'T'HH:mm
     </maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
-    <compileSource>1.6</compileSource>
+    <compileSource>1.7</compileSource>
     <!-- Dependencies -->
     <hadoop-two.version>2.4.0</hadoop-two.version>
     <commons-cli.version>1.2</commons-cli.version>
diff --git a/src/main/docbkx/developer.xml b/src/main/docbkx/developer.xml
index 3d003f1c944..fb0ce6b6949 100644
--- a/src/main/docbkx/developer.xml
+++ b/src/main/docbkx/developer.xml
@@ -146,6 +146,13 @@ mvn clean package -DskipTests
        With Eclipse set up as explained above in <xref linkend="eclipse"/>, you can also simply use the build command in Eclipse.
        To create the full installable HBase package takes a little bit more work, so read on.
        </para>
+       <note>
+         <title>JDK Version Requirements</title>
+         <para>
+           Starting with HBase 1.0 you must use Java 7 or later to build from source code. See <xref linkend="java" /> for more complete
+           information about supported JDK versions.
+         </para>
+       </note>
       </section>
       <section xml:id="build.protobuf"><title>Build Protobuf</title>
             <para>You may need to change the protobuf definitions that reside in the hbase-protocol module or other modules.</para>