Skip to content

Commit

Permalink
[FLINK-1338] Updates necessary due to Apache graduation
Browse files Browse the repository at this point in the history
Removed Disclaimer file
Eliminated unnecessary incubating substrings
Bumped version to 0.8-SNAPSHOT
  • Loading branch information
mbalassi committed Dec 20, 2014
1 parent cadc9cc commit 9555c82
Show file tree
Hide file tree
Showing 39 changed files with 38 additions and 51 deletions.
11 changes: 0 additions & 11 deletions DISCLAIMER

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Apache Flink (incubating): {{ page.title }}</title>
<title>Apache Flink: {{ page.title }}</title>
<link rel="shortcut icon" href="{{ site.baseurl }}favicon.ico" type="image/x-icon">
<link rel="icon" href="{{ site.baseurl }}favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="{{ site.baseurl }}css/bootstrap.css">
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-hadoop-compatibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-hbase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-spargel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>flink-addons</artifactId>
<groupId>org.apache.flink</groupId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-streaming/flink-streaming-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-streaming/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-addons</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/flink-yarn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-addons</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-clients/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-compiler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
1 change: 0 additions & 1 deletion flink-dist/src/main/assemblies/bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ under the License.
<include>*.txt</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
<include>DISCLAIMER*</include>
</includes>
</fileSet>

Expand Down
1 change: 0 additions & 1 deletion flink-dist/src/main/assemblies/yarn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ under the License.
<includes>
<include>*.txt</include>
<include>*.properties</include>
<include>DISCLAIMER*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
Expand Down
2 changes: 1 addition & 1 deletion flink-examples/flink-java-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-examples/flink-scala-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-quickstart/flink-quickstart-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion flink-quickstart/flink-quickstart-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-quickstart</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion flink-quickstart/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-test-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ under the License.

<groupId>org.apache.flink</groupId>
<artifactId>flink-parent</artifactId>
<version>0.8-incubating-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>

<name>flink</name>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion tools/change-version
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# limitations under the License.
################################################################################

find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.8-hadoop2-incubating-SNAPSHOT</version>#<version>0.8-incubating-SNAPSHOT</version>#' {} \;
find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.8-incubating-SNAPSHOT</version>#<version>0.8-SNAPSHOT</version>#' {} \;
2 changes: 1 addition & 1 deletion tools/deploy_to_maven.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9555c82

Please sign in to comment.