[FLINK-1712] Remove "flink-staging" module

This closes apache#1492
This closes apache#1482

.gitignore

@@ -19,7 +19,7 @@ tmp
 _site
 docs/api
 build-target
-flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
+flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
 flink-runtime-web/web-dashboard/node_modules/
 flink-runtime-web/web-dashboard/bower_components/
 atlassian-ide-plugin.xml

docs/apis/hadoop_compatibility.md

@@ -46,7 +46,7 @@ The code is located in `org.apache.flink.api.java.hadoop` and
 `org.apache.flink.api.scala.hadoop` in an additional sub-package for the
 `mapred` and `mapreduce` API.
 
-Support for Hadoop Mappers and Reducers is contained in the `flink-staging`
+Support for Hadoop Mappers and Reducers is contained in the `flink-hadoop-compatibility`
 Maven module.
 This code resides in the `org.apache.flink.hadoopcompatibility`
 package.

docs/apis/streaming_guide.md

@@ -3916,7 +3916,7 @@ After installing Docker an image can be pulled for each connector. Containers ca
 For the easiest setup, create a jar with all the dependencies of the *flink-streaming-connectors* project.
 
 ~~~bash
-cd /PATH/TO/GIT/flink/flink-staging/flink-streaming-connectors
+cd /PATH/TO/GIT/flink/flink-streaming-connectors
 mvn assembly:assembly
 ~~~bash
 

docs/internals/general_arch.md

@@ -97,9 +97,7 @@ In addition to the projects listed in the figure above, Flink currently contains
 - `flink-dist`: The *distribution* project. It defines how to assemble the compiled code, scripts, and other resources
 into the final folder structure that is ready to use.
 
-- `flink-staging`: A series of projects that are in an early version. Currently contains
-among other things projects for YARN support, JDBC data sources and sinks, hadoop compatibility,
-graph specific operators, and HBase connectors.
+- `flink-contrib`: A series of projects that are in an early version.
 
 - `flink-quickstart`: Scripts, maven archetypes, and example programs for the quickstarts and tutorials.
 

docs/internals/stream_checkpointing.md

@@ -141,7 +141,7 @@ It is possible to let an operator continue processing while it stores its state
 After receiving the checkpoint barriers on its inputs, the operator starts the asynchronous snapshot copying of its state. It immediately emits the barrier to its outputs and continues with the regular stream processing. Once the background copy process has completed, it acknowledges the checkpoint to the checkpoint coordinator (the JobManager). The checkpoint is now only complete after all sinks received the barriers and all stateful operators acknowledged their completed backup (which may be later than the barriers reaching the sinks).
 
 User-defined state that is used through the key/value state abstraction can be snapshotted *asynchronously*.
-User functions that implement the interface {% gh_link /flink-staging/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java "Checkpointed" %} will be snapshotted *synchronously*, while functions that implement {% gh_link /flink-staging/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java "CheckpointedAsynchronously" %} will be snapshotted *asynchronously*. Note that for the latter, the user function must guarantee that any future modifications to its state to not affect the state object returned by the `snapshotState()` method.
+User functions that implement the interface {% gh_link /flink-FIXME/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/Checkpointed.java "Checkpointed" %} will be snapshotted *synchronously*, while functions that implement {% gh_link /flink-FIXME/flink-streaming/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/checkpoint/CheckpointedAsynchronously.java "CheckpointedAsynchronously" %} will be snapshotted *asynchronously*. Note that for the latter, the user function must guarantee that any future modifications to its state to not affect the state object returned by the `snapshotState()` method.
 
 
 

docs/setup/flink_on_tez.md

@@ -23,8 +23,9 @@ under the License.
 <a href="#top"></a>
 
 You can run Flink using Tez as an execution environment. Flink on Tez 
-is currently included in *flink-staging* in alpha. All classes are
-located in the *org.apache.flink.tez* package.
+is currently included in the *flink-contrib* module, which means it is 
+in alpha stability. All classes are located in the *org.apache.flink.tez* 
+package.
 
 * This will be replaced by the TOC
 {:toc}
@@ -101,7 +102,7 @@ public class WordCountExample {
  using `mvn -DskipTests clean package -Pinclude-tez -Dhadoop.version=X.X.X -Dtez.version=X.X.X`.
  Make sure that the Hadoop version matches the version that Tez uses.
  Obtain the jar file contained in the Flink distribution under
- `flink-staging/flink-tez/target/flink-tez-x.y.z-flink-fat-jar.jar` 
+ `flink-contrib/flink-tez/target/flink-tez-x.y.z-flink-fat-jar.jar` 
  and upload it to some directory in HDFS. E.g., to upload the file
  to the directory `/apps`, execute
  {% highlight bash %}

flink-staging/flink-avro/pom.xml → flink-batch-connectors/flink-avro/pom.xml

@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-batch-connectors</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-hadoop-compatibility/pom.xml → flink-batch-connectors/flink-hadoop-compatibility/pom.xml

@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-batch-connectors</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-hbase/pom.xml → flink-batch-connectors/flink-hbase/pom.xml

@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-batch-connectors</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-hcatalog/pom.xml → flink-batch-connectors/flink-hcatalog/pom.xml

@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-batch-connectors</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-jdbc/pom.xml → flink-batch-connectors/flink-jdbc/pom.xml

@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-batch-connectors</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/pom.xml → flink-batch-connectors/pom.xml

@@ -30,8 +30,8 @@ under the License.
  </parent>
 
 
- <artifactId>flink-staging</artifactId>
- <name>flink-staging</name>
+ <artifactId>flink-batch-connectors</artifactId>
+ <name>flink-batch-connectors</name>
  <packaging>pom</packaging>
 
  <modules>
@@ -40,33 +40,6 @@ under the License.
  <module>flink-hadoop-compatibility</module>
  <module>flink-hbase</module>
  <module>flink-hcatalog</module>
- <module>flink-table</module>
- <module>flink-ml</module>
- <module>flink-scala-shell</module>
  </modules>
 
- <!-- See main pom.xml for explanation of profiles -->
- <profiles>
- <profile>
- <id>hadoop-2</id>
- <activation>
- <property>
- <!-- Please do not remove the 'hadoop2' comment. See ./tools/generate_specific_pom.sh -->
- <!--hadoop2--><name>!hadoop.profile</name>
- </property>
- </activation>
- <modules>
- <!-- Include the flink-fs-tests project only for HD2.
- The HDFS minicluster interfaces changed between the two versions.
- -->
- <module>flink-fs-tests</module>
- </modules>
- </profile>
- <profile>
- <id>include-tez</id>
- <modules>
- <module>flink-tez</module>
- </modules>
- </profile>
- </profiles>
 </project>

flink-staging/flink-tez/pom.xml → flink-contrib/flink-tez/pom.xml

@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-contrib-parent</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-contrib/pom.xml

@@ -31,6 +31,11 @@ under the License.
  <relativePath>..</relativePath>
  </parent>
 
+ <artifactId>flink-contrib-parent</artifactId>
+ <name>flink-contrib-parent</name>
+
+ <packaging>pom</packaging>
+
  <modules>
  <module>flink-storm</module>
  <module>flink-storm-examples</module>
@@ -40,9 +45,14 @@ under the License.
  <module>flink-connector-wikiedits</module>
  </modules>
 
- <artifactId>flink-contrib-parent</artifactId>
- <name>flink-contrib</name>
 
- <packaging>pom</packaging>
+ <profiles>
+ <profile>
+ <id>include-tez</id>
+ <modules>
+ <module>flink-tez</module>
+ </modules>
+ </profile>
+ </profiles>
 
 </project>

flink-dist/src/main/assemblies/bin.xml

@@ -71,7 +71,7 @@ under the License.
 
  <!-- flink scala shell-->
  <fileSet>
- <directory>../flink-staging/flink-scala-shell/start-script/</directory>
+ <directory>../flink-scala-shell/start-script/</directory>
  <outputDirectory>bin</outputDirectory>
  <fileMode>755</fileMode>
  </fileSet>
@@ -138,17 +138,6 @@ under the License.
  <outputDirectory>tools</outputDirectory>
  <fileMode>0644</fileMode>
  </fileSet>
- <fileSet>
- <directory>../flink-clients/src/main/resources/web-docs</directory>
- <outputDirectory>tools</outputDirectory>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>*.html</exclude>
- <exclude>img/delete-icon.png</exclude>
- <exclude>img/GradientBoxes.png</exclude>
- <exclude>img/gradient.jpg</exclude>
- </excludes>
- </fileSet>
 
  <!-- copy jar files of the batch examples -->
  <fileSet>

flink-examples/flink-examples-batch/pom.xml

@@ -246,13 +246,13 @@ under the License.
 
  <!-- EnumTriangles Basic -->
  <execution>
- <id>EnumerateGraphTriangles</id>
+ <id>EnumTriangles</id>
  <phase>package</phase>
  <goals>
  <goal>jar</goal>
  </goals>
  <configuration>
- <classifier>EnumerateGraphTriangles</classifier>
+ <classifier>EnumTriangles</classifier>
 
  <archive>
  <manifestEntries>
@@ -383,7 +383,7 @@ under the License.
  <target>
  <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" />
  <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" />
- <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-EnumerateGraphTriangles.jar" tofile="${project.basedir}/target/EnumerateGraphTriangles.jar" />
+ <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" />
  <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" />
  <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" />
  <copy file="${project.basedir}/target/flink-examples-batch-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" />

flink-staging/flink-fs-tests/pom.xml → flink-fs-tests/pom.xml

@@ -22,7 +22,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-parent</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-ml/pom.xml → flink-libraries/flink-ml/pom.xml

@@ -23,7 +23,7 @@
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-libraries</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-staging/flink-table/pom.xml → flink-libraries/flink-table/pom.xml

@@ -22,7 +22,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-libraries</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

flink-libraries/pom.xml

@@ -37,5 +37,7 @@ under the License.
  <module>flink-gelly</module>
  <module>flink-gelly-scala</module>
  <module>flink-python</module>
+ <module>flink-table</module>
+ <module>flink-ml</module>
  </modules>
 </project>

flink-staging/flink-scala-shell/pom.xml → flink-scala-shell/pom.xml

@@ -22,7 +22,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-staging</artifactId>
+ <artifactId>flink-parent</artifactId>
  <version>1.0-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>
@@ -167,8 +167,8 @@ under the License.
  <!-- Add src/main/scala to eclipse build path -->
  <execution>
  <id>add-source</id>
- <!-- phase should be initialize for successful javadoc generation -->
- <phase>initialize</phase>
+ <!-- phase should be initialize for successful javadoc generation -->
+ <phase>initialize</phase>
  <goals>
  <goal>add-source</goal>
  </goals>
@@ -213,7 +213,7 @@ under the License.
  <failOnWarning>false</failOnWarning>
  <sourceDirectory>${basedir}/src/main/scala</sourceDirectory>
  <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory>
- <configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
+ <configLocation>${project.basedir}/../tools/maven/scalastyle-config.xml</configLocation>
  <outputFile>${project.basedir}/scalastyle-output.xml</outputFile>
  <outputEncoding>UTF-8</outputEncoding>
  </configuration>