From 1f1a13f2e2a28eb818cd85b6c50e47b52aaa2c2e Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Mon, 3 Oct 2016 14:02:28 -0700 Subject: [PATCH] HBASE-16753 There is a mismatch between suggested Java version in hbase-env.sh Signed-off-by: Dima Spivak --- bin/hbase-config.sh | 2 +- conf/hbase-env.cmd | 2 +- conf/hbase-env.sh | 4 ++-- src/main/asciidoc/_chapters/configuration.adoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh index d7d7e6fdc91..bf4ee92d99e 100644 --- a/bin/hbase-config.sh +++ b/bin/hbase-config.sh @@ -132,7 +132,7 @@ if [ -z "$JAVA_HOME" ]; then | Please download the latest Sun JDK from the Sun Java web site | | > http://www.oracle.com/technetwork/java/javase/downloads | | | -| HBase requires Java 1.7 or later. | +| HBase requires Java 1.8 or later. | +======================================================================+ EOF exit 1 diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd index d16de552bf5..8c8597e84df 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.7+ required. +@rem The java implementation to use. Java 1.8+ 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 31e844123c7..d9879c62809 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -24,8 +24,8 @@ # 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.7+ required. -# export JAVA_HOME=/usr/java/jdk1.6.0/ +# The java implementation to use. Java 1.8+ required. +# export JAVA_HOME=/usr/java/jdk1.8.0/ # Extra Java CLASSPATH elements. Optional. # export HBASE_CLASSPATH= diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index 4804332b3f1..048b0474dd7 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -729,7 +729,7 @@ The following lines in the _hbase-env.sh_ file show how to set the `JAVA_HOME` e ---- # The java implementation to use. -export JAVA_HOME=/usr/java/jdk1.7.0/ +export JAVA_HOME=/usr/java/jdk1.8.0/ # The maximum amount of heap to use. Default is left to JVM default. export HBASE_HEAPSIZE=4G