From e503ebcfc2330544c7bebcdaead6b1c5292409a9 Mon Sep 17 00:00:00 2001
From: Stephan Ewen <sewen@apache.org>
Date: Thu, 6 Aug 2015 20:29:24 +0200
Subject: [PATCH] [FLINK-2453] [docs] Update README and setup docs to reflect
 requirement for Java 7+

---
 README.md                   | 2 +-
 docs/setup/cluster_setup.md | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d9250b8c1b5..3cf08c77803 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Prerequisites for building Flink:
 * Unix-like environment (We use Linux, Mac OS X, Cygwin)
 * git
 * Maven (at least version 3.0.4)
-* Java 6, 7 or 8 (Note that Oracle's JDK 6 library will fail to build Flink, but is able to run a pre-compiled package without problem)
+* Java 7 or 8
 
 ```
 git clone https://github.com/apache/flink.git
diff --git a/docs/setup/cluster_setup.md b/docs/setup/cluster_setup.md
index 232708b5569..474aace711c 100644
--- a/docs/setup/cluster_setup.md
+++ b/docs/setup/cluster_setup.md
@@ -40,7 +40,7 @@ and **Cygwin** (for Windows) and expects the cluster to consist of **one master
 node** and **one or more worker nodes**. Before you start to setup the system,
 make sure you have the following software installed **on each node**:
 
-- **Java 1.6.x** or higher,
+- **Java 1.7.x** or higher,
 - **ssh** (sshd must be running to use the Flink scripts that manage
   remote components)
 
@@ -65,9 +65,9 @@ The command should output something comparable to the following on every node of
 your cluster (depending on your Java version, there may be small differences):
 
 ~~~bash
-java version "1.6.0_22"
-Java(TM) SE Runtime Environment (build 1.6.0_22-b04)
-Java HotSpot(TM) 64-Bit Server VM (build 17.1-b03, mixed mode)
+java version "1.7.0_55"
+Java(TM) SE Runtime Environment (build 1.7.0_55-b13)
+Java HotSpot(TM) 64-Bit Server VM (build 24.55-b03, mixed mode)
 ~~~
 
 To make sure the ssh daemon is running properly, you can use the command
-- 
GitLab