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

HBASE-11666 Enforce JDK7 javac for builds on branch-1 and master (Sean Busbey)

This commit is contained in:
Ted Yu 2014-08-05 14:59:54 +00:00
parent 6a7f923c0d
commit 17c869d543
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/hbase-config.sh
View File

@ -131,7 +131,7 @@ if [ -z "$JAVA_HOME" ]; then
| Please download the latest Sun JDK from the Sun Java web site | | Please download the latest Sun JDK from the Sun Java web site |
| > http://java.sun.com/javase/downloads/ < | | > 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 | | NOTE: This script will find Sun Java whether you install using the |
| binary or the RPM based installer. | | binary or the RPM based installer. |
+======================================================================+ +======================================================================+

2
conf/hbase-env.cmd
View File

@ -18,7 +18,7 @@
@rem Set environment variables here. @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 set JAVA_HOME=c:\apps\java
@rem Extra Java CLASSPATH elements. Optional. @rem Extra Java CLASSPATH elements. Optional.

2
conf/hbase-env.sh
View File

@ -25,7 +25,7 @@
# so try to keep things idempotent unless you want to take an even deeper look # so try to keep things idempotent unless you want to take an even deeper look
# into the startup scripts (bin/hbase, etc.) # 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/ # export JAVA_HOME=/usr/java/jdk1.6.0/
# Extra Java CLASSPATH elements. Optional. # Extra Java CLASSPATH elements. Optional.

2
pom.xml
View File

@ -899,7 +899,7 @@
yyyy-MM-dd'T'HH:mm yyyy-MM-dd'T'HH:mm
</maven.build.timestamp.format> </maven.build.timestamp.format>
<buildDate>${maven.build.timestamp}</buildDate> <buildDate>${maven.build.timestamp}</buildDate>
<compileSource>1.6</compileSource> <compileSource>1.7</compileSource>
<!-- Dependencies --> <!-- Dependencies -->
<hadoop-two.version>2.4.0</hadoop-two.version> <hadoop-two.version>2.4.0</hadoop-two.version>
<commons-cli.version>1.2</commons-cli.version> <commons-cli.version>1.2</commons-cli.version>

7
src/main/docbkx/developer.xml
View File

@ -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. 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. To create the full installable HBase package takes a little bit more work, so read on.
</para> </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>
<section xml:id="build.protobuf"><title>Build Protobuf</title> <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> <para>You may need to change the protobuf definitions that reside in the hbase-protocol module or other modules.</para>