提交 d7609a95 编写于 作者: R Robert Metzger

Set version of poms to 0.7-incubating-SNAPSHOT ; 0.6-incubating release tasks:

- update _config.yaml of integrated documentation
- quick check on the quickstarts / build instructions to match the latest release
- quickstart.sh scrips now point to the correct versions.
上级 0bb3af78
......@@ -5,13 +5,15 @@
# {{ site.CONFIG_KEY }}
#------------------------------------------------------------------------------
FLINK_VERSION_STABLE: 0.6-incubating-SNAPSHOT # this variable can point to a SNAPSHOT version in the git source.
FLINK_VERSION_HADOOP_2_STABLE: 0.6-hadoop2-incubating-SNAPSHOT
FLINK_VERSION_STABLE: 0.6-incubating # this variable can point to a SNAPSHOT version in the git source.
FLINK_VERSION_HADOOP_2_STABLE: 0.6-hadoop2-incubating
FLINK_VERSION_SHORT: 0.6
FLINK_ISSUES_URL: https://issues.apache.org/jira/browse/FLINK
FLINK_GITHUB_URL: https://github.com/apache/incubator-flink
FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
FLINK_DOWNLOAD_URL_HADOOP_1_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop1.tgz
FLINK_DOWNLOAD_URL_HADOOP_2_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2.tgz
FLINK_DOWNLOAD_URL_YARN_STABLE: http://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2-yarn.tgz
#------------------------------------------------------------------------------
# BUILD CONFIG
......
......@@ -2,15 +2,6 @@
title: "Quick Start: Run K-Means Example"
---
<div class="panel panel-warning">
<div class="panel-heading">
Note
</div>
<div class="panel-body">
This page is using both names "Flink" and "Stratosphere" to refer to the system. We recently changed the name to Apache Flink, but there is no stable release available for it yet, therefore the example here refers to the latest stable Stratosphere release (0.5.2).
</div>
</div>
This guide will demonstrate Flink's features by example. You will see how you can leverage Flink's Iteration-feature to find clusters in a dataset using [K-Means clustering](http://en.wikipedia.org/wiki/K-means_clustering).
On the way, you will see the compiler, the status interface and the result of the algorithm.
......@@ -18,8 +9,6 @@ On the way, you will see the compiler, the status interface and the result of th
# Generate Input Data
Flink contains a data generator for K-Means.
<!--
REACTIVATE WHEN WE HAVE A FIRST APACHE FLINK RELEASE
# Download Flink
wget {{ site.FLINK_DOWNLOAD_URL_HADOOP_1_STABLE }}
......@@ -31,17 +20,7 @@ Flink contains a data generator for K-Means.
java -cp ../examples/flink-java-examples-{{ site.FLINK_VERSION_STABLE }}-KMeans.jar org.apache.flink.example.java.clustering.util.KMeansDataGenerator 500 10 0.08
cp /tmp/points .
cp /tmp/centers .
-->
# Download Flink (still called Stratosphere in the 0.5.2 release)
wget https://github.com/stratosphere/stratosphere/releases/download/release-0.5.2/stratosphere-0.5.2-bin.tgz
tar xzf stratosphere-*.tgz
cd stratosphere
mkdir kmeans
cd kmeans
# Run data generator
java -cp ../examples/stratosphere-java-examples-0.5.2-KMeans.jar eu.stratosphere.example.java.clustering.util.KMeansDataGenerator 500 10 0.08
cp /tmp/points .
cp /tmp/centers .
The generator has the following arguments:
......@@ -74,10 +53,10 @@ The following overview presents the impact of the different standard deviations
We are using the generated input data to run the clustering using a Flink job.
# go to the Flink-root directory
cd stratosphere
# start Stratosphere/Flink (use ./bin/start-cluster.sh if you're on a cluster)
cd flink
# start Flink (use ./bin/start-cluster.sh if you're on a cluster)
./bin/start-local.sh
# Start Stratosphere/Flink web client
# Start Flink web client
./bin/start-webclient.sh
# Review Flink Compiler
......@@ -91,7 +70,7 @@ The Flink webclient allows to submit Flink programs using a graphical user inter
1. <a href="http://localhost:8080/launch.html">Open webclient on localhost:8080</a> <br>
2. Upload the file.
{% highlight bash %}
examples/stratosphere-java-examples-0.5-SNAPSHOT-KMeans.jar
examples/flink-java-examples-0.6-incubating-KMeans.jar
{% endhighlight %} </br>
3. Select it in the left box to see how the operators in the plan are connected to each other. <br>
4. Enter the arguments in the lower left box:
......
......@@ -8,7 +8,7 @@ Start YARN session with 4 Task Managers (each with 4 GB of Heapspace):
```bash
wget {{ site.FLINK_DOWNLOAD_URL_YARN_STABLE }}
tar xvzf flink-dist-{{ site.FLINK_VERSION_STABLE }}-yarn.tar.gz
tar xvzf flink-{{ site.FLINK_VERSION_STABLE }}-bin-hadoop2-yarn.tgz
cd flink-yarn-{{ site.FLINK_VERSION_STABLE }}/
./bin/yarn-session.sh -n 4 -jm 1024 -tm 4096
```
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-addons</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-addons</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -52,12 +52,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -53,12 +53,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -24,7 +24,7 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-java \
-DarchetypeVersion=0.6-incubating-SNAPSHOT \
-DarchetypeVersion=0.7-incubating-SNAPSHOT \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
......@@ -45,12 +45,3 @@ echo -e "\\t\\t mvn clean package"
echo -e "\\tYou will find the runnable jar in $PACKAGE/target"
echo -e "\\n\\n"
# Use this command if you want to specify the coordinates of your generated artifact
# in an interactive menu:
#
#mvn archetype:generate \
# -DarchetypeGroupId=org.apache.flink \
# -DarchetypeArtifactId=flink-quickstart-java \
# -DarchetypeVersion=0.6-SNAPSHOT \
# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/
......@@ -24,11 +24,11 @@ PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-scala \
-DarchetypeVersion=0.6-incubating-SNAPSHOT \
-DarchetypeVersion=0.7-incubating-SNAPSHOT \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
-Dpackage=org.apache.flink.quickstart \
-Dpackage=org.apache.flink \
-DinteractiveMode=false \
-DarchetypeCatalog=https://repository.apache.org/content/repositories/snapshots/
......@@ -45,12 +45,3 @@ echo -e "\\t\\t mvn clean package"
echo -e "\\tYou will find the runnable jar in $PACKAGE/target"
echo -e "\\n\\n"
# Use this command if you want to specify the coordinates of your generated artifact
# in an interactive menu:
#
#mvn archetype:generate \
# -DarchetypeGroupId=org.apache.flink \
# -DarchetypeArtifactId=quickstart-scala \
# -DarchetypeVersion=0.6-SNAPSHOT \
# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/
......@@ -22,35 +22,26 @@
PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=eu.stratosphere \
-DarchetypeArtifactId=quickstart-scala \
-DarchetypeVersion=0.5.2 \
-DgroupId=eu.stratosphere \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-scala \
-DarchetypeVersion=0.6-incubating \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
-Dpackage=eu.stratosphere.quickstart \
-Dpackage=org.apache.flink \
-DinteractiveMode=false
#
# Give some guidance
#
echo -e "\\n\\n"
echo -e "\\tA sample quickstart Stratosphere Job has been created."
echo -e "\\tA sample quickstart Flink Job has been created."
echo -e "\\tSwitch into the directory using"
echo -e "\\t\\t cd $PACKAGE"
echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)"
echo -e "\\tBuild a jar inside the directory using"
echo -e "\\t\\t mvn clean package"
echo -e "\\tYou will find the runnable jar in $PACKAGE/target"
echo -e "\\tConsult our mailing list if you have any troubles: https://groups.google.com/forum/#!forum/stratosphere-dev"
echo -e "\\tConsult our website if you have any troubles: http://flink.incubator.apache.org/community.html#mailing-lists"
echo -e "\\n\\n"
# Use this command if you want to specify the coordinates of your generated artifact
# in an interactive menu:
#
# mvn archetype:generate \
# -DarchetypeGroupId=eu.stratosphere \
# -DarchetypeArtifactId=quickstart-scala \
# -DarchetypeVersion=0.4-SNAPSHOT \
# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/
......@@ -21,36 +21,28 @@
PACKAGE=quickstart
mvn archetype:generate \
-DarchetypeGroupId=eu.stratosphere \
-DarchetypeArtifactId=quickstart-java \
-DarchetypeVersion=0.5.2 \
-DgroupId=eu.stratosphere \
mvn archetype:generate \
-DarchetypeGroupId=org.apache.flink \
-DarchetypeArtifactId=flink-quickstart-java \
-DarchetypeVersion=0.6-incubating \
-DgroupId=org.apache.flink \
-DartifactId=$PACKAGE \
-Dversion=0.1 \
-Dpackage=eu.stratosphere.quickstart \
-Dpackage=org.apache.flink \
-DinteractiveMode=false
#
# Give some guidance
#
echo -e "\\n\\n"
echo -e "\\tA sample quickstart Stratosphere Job has been created."
echo -e "\\tA sample quickstart Flink Job has been created."
echo -e "\\tSwitch into the directory using"
echo -e "\\t\\t cd $PACKAGE"
echo -e "\\tImport the project there using your favorite IDE (Import it as a maven project)"
echo -e "\\tBuild a jar inside the directory using"
echo -e "\\t\\t mvn clean package"
echo -e "\\tYou will find the runnable jar in $PACKAGE/target"
echo -e "\\tConsult our mailing list if you have any troubles: https://groups.google.com/forum/#!forum/stratosphere-dev"
echo -e "\\tConsult our website if you have any troubles: http://flink.incubator.apache.org/community.html#mailing-lists"
echo -e "\\n\\n"
# Use this command if you want to specify the coordinates of your generated artifact
# in an interactive menu:
#
# mvn archetype:generate \
# -DarchetypeGroupId=eu.stratosphere \
# -DarchetypeArtifactId=quickstart-java \
# -DarchetypeVersion=0.4 \
# -DarchetypeCatalog=https://oss.sonatype.org/content/repositories/snapshots/
......@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
......
......@@ -30,7 +30,7 @@ under the License.
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.6-incubating-SNAPSHOT</version>
<version>0.7-incubating-SNAPSHOT</version>
<name>flink</name>
<packaging>pom</packaging>
......
......@@ -17,4 +17,4 @@
# limitations under the License.
################################################################################
find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.5-SNAPSHOT</version>#<version>0.6-SNAPSHOT</version>#' {} \;
find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.6-incubating-SNAPSHOT</version>#<version>0.7-incubating-SNAPSHOT</version>#' {} \;
......@@ -119,6 +119,7 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
# job nr 6 is YARN
if [[ $TRAVIS_JOB_NUMBER == *6 ]] ; then
# move to current dir
CURRENT_FLINK_VERSION=$CURRENT_FLINK_VERSION_YARN
mkdir flink-$CURRENT_FLINK_VERSION-bin-yarn
cp -r flink-dist/target/flink-*-bin/flink-yarn*/* flink-$CURRENT_FLINK_VERSION-bin-yarn/
tar -czf flink-$CURRENT_FLINK_VERSION-bin-yarn.tgz flink-$CURRENT_FLINK_VERSION-bin-yarn
......@@ -129,6 +130,8 @@ if [[ $TRAVIS_PULL_REQUEST == "false" ]] ; then
cp -r flink-dist/target/flink-*-bin/flink-$CURRENT_FLINK_VERSION*/* flink-$CURRENT_FLINK_VERSION-bin/
tar -czf flink-$CURRENT_FLINK_VERSION-bin.tgz flink-$CURRENT_FLINK_VERSION-bin
travis-artifacts upload --path flink-$CURRENT_FLINK_VERSION-bin.tgz --target-path /
echo "doing a ls -lisah:"
ls -lisah
fi
fi # pull request check
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册