Set version of poms to 0.7-incubating-SNAPSHOT ; 0.6-incubating relea…

…se 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.
nderraugh · Aug 23, 2014 · d7609a9 · d7609a9
1 parent 0bb3af7
commit d7609a9
Show file tree

Hide file tree

Showing 39 changed files with 65 additions and 116 deletions.
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -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:https://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop1.tgz
+FLINK_DOWNLOAD_URL_HADOOP_2_STABLE: http:https://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2.tgz
+FLINK_DOWNLOAD_URL_YARN_STABLE: http:https://www.apache.org/dyn/closer.cgi/incubator/flink/flink-0.6-incubating-bin-hadoop2-yarn.tgz
 
 #------------------------------------------------------------------------------
 # BUILD CONFIG

diff --git a/docs/run_example_quickstart.md b/docs/run_example_quickstart.md
@@ -2,24 +2,13 @@
 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:https://en.wikipedia.org/wiki/K-means_clustering). 
 On the way, you will see the compiler, the status interface and the result of the algorithm.
 
 
 # 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:https://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:

diff --git a/docs/yarn_setup.md b/docs/yarn_setup.md
@@ -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
 ```

diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-jdbc/pom.xml b/flink-addons/flink-jdbc/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-spargel/pom.xml b/flink-addons/flink-spargel/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml
@@ -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>
 

diff --git a/flink-addons/flink-yarn/pom.xml b/flink-addons/flink-yarn/pom.xml
@@ -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>
 

diff --git a/flink-addons/pom.xml b/flink-addons/pom.xml
@@ -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>
 

diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
@@ -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>
 

diff --git a/flink-compiler/pom.xml b/flink-compiler/pom.xml
@@ -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>
 

diff --git a/flink-core/pom.xml b/flink-core/pom.xml
@@ -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>
 

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -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>
 

diff --git a/flink-examples/flink-java-examples/pom.xml b/flink-examples/flink-java-examples/pom.xml
@@ -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>
 

diff --git a/flink-examples/flink-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml
@@ -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>
 

diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
@@ -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>
 

diff --git a/flink-java/pom.xml b/flink-java/pom.xml
@@ -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>
 

diff --git a/flink-java8-tests/pom.xml b/flink-java8-tests/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/flink-quickstart-java/pom.xml b/flink-quickstart/flink-quickstart-java/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/flink-quickstart-scala/pom.xml b/flink-quickstart/flink-quickstart-scala/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/pom.xml b/flink-quickstart/pom.xml
@@ -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>
 

diff --git a/flink-quickstart/quickstart-SNAPSHOT.sh b/flink-quickstart/quickstart-SNAPSHOT.sh
@@ -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/
diff --git a/flink-quickstart/quickstart-scala-SNAPSHOT.sh b/flink-quickstart/quickstart-scala-SNAPSHOT.sh
@@ -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/