This is an automated email from the ASF dual-hosted git repository.
mergebot-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/beam-site.git
commit c427295a6ab1e611352bdb6935e7102dcd957c2b
Author: Mergebot <merge...@apache.org>
AuthorDate: Tue Sep 18 16:46:04 2018 +0000
Prepare repository for deployment.
---
content/documentation/runners/flink/index.html | 50 +++++++++++++++++++-------
1 file changed, 38 insertions(+), 12 deletions(-)
diff --git a/content/documentation/runners/flink/index.html
b/content/documentation/runners/flink/index.html
index 4add34a..84e579b 100644
--- a/content/documentation/runners/flink/index.html
+++ b/content/documentation/runners/flink/index.html
@@ -168,6 +168,7 @@
<ul class="nav">
<li><a href="#flink-runner-prerequisites-and-setup">Flink Runner
prerequisites and setup</a>
<ul>
+ <li><a href="#version-compatibility">Version Compatibility</a></li>
<li><a href="#specify-your-dependency">Specify your dependency</a></li>
</ul>
</li>
@@ -200,6 +201,8 @@ limitations under the License.
-->
<h1 id="using-the-apache-flink-runner">Using the Apache Flink Runner</h1>
+<p>The old Flink Runner will eventually be replaced by the Portable Runner
which enables to run pipelines in other languages than Java. Please see the <a
href="/contribute/portability/">Portability page</a> for the latest state.</p>
+
<nav class="language-switcher">
<strong>Adapt for:</strong>
<ul>
@@ -227,27 +230,50 @@ limitations under the License.
<p>If you want to use the local execution mode with the Flink runner to don’t
have to complete any setup.</p>
-<p>To use the Flink Runner for executing on a cluster, you have to setup a
Flink cluster by following the Flink <a
href="https://ci.apache.org/projects/flink/flink-docs-release-1.1/quickstart/setup_quickstart.html";>setup
quickstart</a>.</p>
+<p>To use the Flink Runner for executing on a cluster, you have to setup a
Flink cluster by following the Flink <a
href="https://ci.apache.org/projects/flink/flink-docs-stable/quickstart/setup_quickstart.html";>setup
quickstart</a>.</p>
-<p>To find out which version of Flink you need you can run this command to
check the version of the Flink dependency that your project is using:</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>$ mvn
dependency:tree -Pflink-runner |grep flink
-...
-[INFO] | +- org.apache.flink:flink-streaming-java_2.10:jar:1.2.1:runtime
-...
-</code></pre>
-</div>
-<p>Here, we would need Flink 1.2.1. Please also note the Scala version in the
dependency name. In this case we need to make sure to use a Flink cluster with
Scala version 2.10.</p>
+<h3 id="version-compatibility">Version Compatibility</h3>
+
+<p>The Flink cluster version has to match the version used by the FlinkRunner.
To find out which version of Flink please see the table below:</p>
+
+<table class="table table-bordered">
+<tr>
+ <th>Beam version</th>
+ <th>Flink version</th>
+</tr>
+<tr>
+ <td>2.7.0, 2.6.0</td>
+ <td>1.5.x</td>
+</tr>
+<tr>
+ <td>2.5.0, 2.4.0, 2.3.0</td>
+ <td>1.4.x</td>
+</tr>
+<tr>
+ <td>2.2.0</td>
+ <td>1.3.x with Scala 2.10</td>
+</tr>
+<tr>
+ <td>2.2.0, 2.1.x</td>
+ <td>1.3.x with Scala 2.10</td>
+</tr>
+<tr>
+ <td>2.0.0</td>
+ <td>1.2.x with Scala 2.10</td>
+</tr>
+</table>
+
+<p>For retrieving the right version, see the <a
href="https://flink.apache.org/downloads.html";>Flink downloads page</a>.</p>
-<p>For more information, the <a
href="https://ci.apache.org/projects/flink/flink-docs-release-1.1/";>Flink
Documentation</a> can be helpful.</p>
+<p>For more information, the <a
href="https://ci.apache.org/projects/flink/flink-docs-stable/";>Flink
Documentation</a> can be helpful.</p>
<h3 id="specify-your-dependency">Specify your dependency</h3>
<p><span class="language-java">When using Java, you must specify your
dependency on the Flink Runner in your <code
class="highlighter-rouge">pom.xml</code>.</span></p>
<div class="language-java highlighter-rouge"><pre
class="highlight"><code><span class="o"><</span><span
class="n">dependency</span><span class="o">></span>
<span class="o"><</span><span class="n">groupId</span><span
class="o">></span><span class="n">org</span><span class="o">.</span><span
class="na">apache</span><span class="o">.</span><span
class="na">beam</span><span class="o"></</span><span
class="n">groupId</span><span class="o">></span>
- <span class="o"><</span><span class="n">artifactId</span><span
class="o">></span><span class="n">beam</span><span class="o">-</span><span
class="n">runners</span><span class="o">-</span><span
class="n">flink_2</span><span class="o">.</span><span class="mi">10</span><span
class="o"></</span><span class="n">artifactId</span><span
class="o">></span>
+ <span class="o"><</span><span class="n">artifactId</span><span
class="o">></span><span class="n">beam</span><span class="o">-</span><span
class="n">runners</span><span class="o">-</span><span
class="n">flink_2</span><span class="o">.</span><span class="mi">11</span><span
class="o"></</span><span class="n">artifactId</span><span
class="o">></span>
<span class="o"><</span><span class="n">version</span><span
class="o">></span><span class="mf">2.6</span><span class="o">.</span><span
class="mi">0</span><span class="o"></</span><span
class="n">version</span><span class="o">></span>
- <span class="o"><</span><span class="n">scope</span><span
class="o">></span><span class="n">runtime</span><span
class="o"></</span><span class="n">scope</span><span class="o">></span>
<span class="o"></</span><span class="n">dependency</span><span
class="o">></span>
</code></pre>
</div>
