diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 48a1a19d5034c..0000000000000 --- a/DISCLAIMER +++ /dev/null @@ -1,11 +0,0 @@ -Apache Flink is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. - diff --git a/README.md b/README.md index 3bfffdcc65a87..248d8d40b85ad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Apache Flink (incubating) +# Apache Flink Apache Flink is an open source system for expressive, declarative, fast, and efficient data analysis. Flink combines the scalability and programming flexibility of distributed MapReduce-like platforms with the efficiency, out-of-core execution, and query optimization capabilities found in parallel databases. diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index e61b92bbbec77..3a5c008ff60aa 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -22,7 +22,7 @@ - Apache Flink (incubating): {{ page.title }} + Apache Flink: {{ page.title }} diff --git a/docs/index.md b/docs/index.md index 83bb52b4c58e9..275419ed74337 100644 --- a/docs/index.md +++ b/docs/index.md @@ -20,7 +20,7 @@ specific language governing permissions and limitations under the License. --> -Apache Flink (incubating) is a platform for efficient, distributed, general-purpose data processing. +Apache Flink is a platform for efficient, distributed, general-purpose data processing. It features powerful programming abstractions in Java and Scala, a high-performance runtime, and automatic program optimization. It has native support for iterations, incremental iterations, and programs consisting of large DAGs of operations. diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml index 75652e913e6ba..eb6afb5a3a1fb 100644 --- a/flink-addons/flink-avro/pom.xml +++ b/flink-addons/flink-avro/pom.xml @@ -26,7 +26,7 @@ under the License. flink-addons org.apache.flink - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml index c494afe9d19fb..27cb0b6d139db 100644 --- a/flink-addons/flink-hadoop-compatibility/pom.xml +++ b/flink-addons/flink-hadoop-compatibility/pom.xml @@ -26,7 +26,7 @@ under the License. flink-addons org.apache.flink - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml index 22a3971823e70..f6b053a0401b8 100644 --- a/flink-addons/flink-hbase/pom.xml +++ b/flink-addons/flink-hbase/pom.xml @@ -25,7 +25,7 @@ under the License. flink-addons org.apache.flink - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-jdbc/pom.xml b/flink-addons/flink-jdbc/pom.xml index 8ffda61ad2bb0..6563bfd91b398 100644 --- a/flink-addons/flink-jdbc/pom.xml +++ b/flink-addons/flink-jdbc/pom.xml @@ -26,7 +26,7 @@ under the License. flink-addons org.apache.flink - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-spargel/pom.xml b/flink-addons/flink-spargel/pom.xml index 4fa2fc5694b11..ba3da2fc66540 100644 --- a/flink-addons/flink-spargel/pom.xml +++ b/flink-addons/flink-spargel/pom.xml @@ -25,7 +25,7 @@ under the License. flink-addons org.apache.flink - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml index 2e2ac3a64b496..ea7f3c1e030df 100644 --- 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. org.apache.flink flink-streaming-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml index 8c1e4385492aa..5cfeb33a6b772 100644 --- 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. org.apache.flink flink-streaming-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml index d2d2b936e061f..31025cf7a9dce 100644 --- 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. org.apache.flink flink-streaming-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml index 3b9eb678e8a50..142bd9547f625 100644 --- a/flink-addons/flink-streaming/pom.xml +++ b/flink-addons/flink-streaming/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-addons - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/flink-yarn/pom.xml b/flink-addons/flink-yarn/pom.xml index 1d16e4866d869..bddb2cd93f5ab 100644 --- a/flink-addons/flink-yarn/pom.xml +++ b/flink-addons/flink-yarn/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.flink flink-addons - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-addons/pom.xml b/flink-addons/pom.xml index 44a84337395a5..2cd3788603dc9 100644 --- a/flink-addons/pom.xml +++ b/flink-addons/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml index f92eede926637..0e6839417028f 100644 --- a/flink-clients/pom.xml +++ b/flink-clients/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-compiler/pom.xml b/flink-compiler/pom.xml index 90a152cd99046..42611cf9878ac 100644 --- a/flink-compiler/pom.xml +++ b/flink-compiler/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-core/pom.xml b/flink-core/pom.xml index 0809115942e75..13ede7791c41a 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 4283ac1e9dcb9..1a2c8ad57f81c 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml index 96da04ef4f3e7..d03e1733aa009 100644 --- a/flink-dist/src/main/assemblies/bin.xml +++ b/flink-dist/src/main/assemblies/bin.xml @@ -88,7 +88,6 @@ under the License. *.txt LICENSE* NOTICE* - DISCLAIMER* diff --git a/flink-dist/src/main/assemblies/yarn.xml b/flink-dist/src/main/assemblies/yarn.xml index 82d7dfb3842f0..301f59d731f7a 100644 --- a/flink-dist/src/main/assemblies/yarn.xml +++ b/flink-dist/src/main/assemblies/yarn.xml @@ -64,7 +64,6 @@ under the License. *.txt *.properties - DISCLAIMER* LICENSE* NOTICE* diff --git a/flink-examples/flink-java-examples/pom.xml b/flink-examples/flink-java-examples/pom.xml index 6870b30cd1f45..089ebcf91bb52 100644 --- a/flink-examples/flink-java-examples/pom.xml +++ b/flink-examples/flink-java-examples/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.flink flink-examples - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-examples/flink-scala-examples/pom.xml b/flink-examples/flink-scala-examples/pom.xml index e60109963fc6d..4b390317ab3ed 100644 --- a/flink-examples/flink-scala-examples/pom.xml +++ b/flink-examples/flink-scala-examples/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.flink flink-examples - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml index 4ad3945a9fbd5..463857680e3c8 100644 --- a/flink-examples/pom.xml +++ b/flink-examples/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-java/pom.xml b/flink-java/pom.xml index 14cb46926c8d2..b4c8b183a98d3 100644 --- a/flink-java/pom.xml +++ b/flink-java/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml index ad1273ca6dca2..0b17451e6f69d 100644 --- a/flink-java8/pom.xml +++ b/flink-java8/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-quickstart/flink-quickstart-java/pom.xml b/flink-quickstart/flink-quickstart-java/pom.xml index 6413f5b256468..5b2b4cb491dd3 100644 --- a/flink-quickstart/flink-quickstart-java/pom.xml +++ b/flink-quickstart/flink-quickstart-java/pom.xml @@ -27,7 +27,7 @@ under the License. org.apache.flink flink-quickstart - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. 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 index 33a38bbfe3435..6daf525be9220 100644 --- 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. org.apache.flink flink-java - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT org.apache.flink flink-clients - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT diff --git a/flink-quickstart/flink-quickstart-scala/pom.xml b/flink-quickstart/flink-quickstart-scala/pom.xml index b2de59a5c4b59..262150e8e7132 100644 --- a/flink-quickstart/flink-quickstart-scala/pom.xml +++ b/flink-quickstart/flink-quickstart-scala/pom.xml @@ -27,7 +27,7 @@ under the License. org.apache.flink flink-quickstart - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. 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 index 4dc3a7faf9748..b2990ff92cd68 100644 --- 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 @@ -52,12 +52,12 @@ under the License. org.apache.flink flink-scala - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT org.apache.flink flink-clients - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT diff --git a/flink-quickstart/pom.xml b/flink-quickstart/pom.xml index 797e08ea29faf..92b2e4929b357 100644 --- a/flink-quickstart/pom.xml +++ b/flink-quickstart/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 4480e6fe48676..960fee6e91337 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index edeb7f29bff18..e2d71e13922ea 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -24,7 +24,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-shaded/pom.xml b/flink-shaded/pom.xml index 14d3d5cdf28b5..4dbae5d62f7cc 100644 --- a/flink-shaded/pom.xml +++ b/flink-shaded/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-test-utils/pom.xml b/flink-test-utils/pom.xml index 4c3ccc572fa0d..9dc0121cad7fe 100644 --- a/flink-test-utils/pom.xml +++ b/flink-test-utils/pom.xml @@ -25,7 +25,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index 68ca94df6a678..3ee7a26854e39 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 267d99e6631a8..8774ed3e62cfd 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. org.apache.flink flink-parent - 0.8-incubating-SNAPSHOT + 0.8-SNAPSHOT flink pom diff --git a/tools/change-version b/tools/change-version index 34b0e54212621..acc05bc48e031 100755 --- a/tools/change-version +++ b/tools/change-version @@ -17,4 +17,4 @@ # limitations under the License. ################################################################################ -find .. -name 'pom.xml' -type f -exec sed -i 's#0.8-hadoop2-incubating-SNAPSHOT#0.8-incubating-SNAPSHOT#' {} \; +find .. -name 'pom.xml' -type f -exec sed -i 's#0.8-incubating-SNAPSHOT#0.8-SNAPSHOT#' {} \; diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh index 4525147410b2d..f4290afd7ba1f 100755 --- a/tools/deploy_to_maven.sh +++ b/tools/deploy_to_maven.sh @@ -53,7 +53,7 @@ function getVersion() { # this will take a while CURRENT_FLINK_VERSION=`getVersion` if [[ "$CURRENT_FLINK_VERSION" == *-SNAPSHOT ]]; then - CURRENT_FLINK_VERSION_HADOOP1=${CURRENT_FLINK_VERSION/-incubating-SNAPSHOT/-hadoop1-incubating-SNAPSHOT} + CURRENT_FLINK_VERSION_HADOOP1=${CURRENT_FLINK_VERSION/-SNAPSHOT/-hadoop1-SNAPSHOT} else CURRENT_FLINK_VERSION_HADOOP1="$CURRENT_FLINK_VERSION-hadoop1" fi