You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/10/15 16:32:37 UTC
flink git commit: [FLINK-2856] Introduce flink.version property into
quickstart archetype
Repository: flink
Updated Branches:
refs/heads/master c82ebbfce -> 6cb0fb51b
[FLINK-2856] Introduce flink.version property into quickstart archetype
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6cb0fb51
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6cb0fb51
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6cb0fb51
Branch: refs/heads/master
Commit: 6cb0fb51bbeaee54d719b2bf05172c01fec98d60
Parents: c82ebbf
Author: Robert Metzger <rm...@apache.org>
Authored: Thu Oct 15 14:35:39 2015 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Thu Oct 15 15:37:11 2015 +0200
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 13 ++++----
.../main/resources/archetype-resources/pom.xml | 13 ++++----
tools/change-version | 20 ------------
tools/change-version.sh | 34 ++++++++++++++++++++
4 files changed, 48 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6cb0fb51/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 8697e53..0b13ab8 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
@@ -30,6 +30,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <flink.version>0.10-SNAPSHOT</flink.version>
</properties>
<repositories>
@@ -74,17 +75,17 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
</dependencies>
@@ -323,19 +324,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/6cb0fb51/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 f65fdbe..9d3d5ae 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
@@ -45,6 +45,7 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <flink.version>0.10-SNAPSHOT</flink.version>
</properties>
<!--
@@ -75,17 +76,17 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
</dependency>
</dependencies>
@@ -329,19 +330,19 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-core</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
- <version>0.10-SNAPSHOT</version>
+ <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/6cb0fb51/tools/change-version
----------------------------------------------------------------------
diff --git a/tools/change-version b/tools/change-version
deleted file mode 100755
index ac69a5d..0000000
--- a/tools/change-version
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-################################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-find .. -name 'pom.xml' -type f -exec sed -i 's#<version>0.9-SNAPSHOT</version>#<version>0.10-SNAPSHOT</version>#' {} \;
http://git-wip-us.apache.org/repos/asf/flink/blob/6cb0fb51/tools/change-version.sh
----------------------------------------------------------------------
diff --git a/tools/change-version.sh b/tools/change-version.sh
new file mode 100755
index 0000000..07b422c
--- /dev/null
+++ b/tools/change-version.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+################################################################################
+
+OLD="0.9-SNAPSHOT"
+NEW="0.10-SNAPSHOT"
+
+
+HERE=` basename "$PWD"`
+if [[ "$HERE" != "tools" ]]; then
+ echo "Please only execute in the tools/ directory";
+ exit 1;
+fi
+
+# change version in all pom files
+find .. -name 'pom.xml' -type f -exec sed -i 's#<version>'"$OLD"'</version>#<version>'"$NEW"'</version>#' {} \;
+
+# change version of the quickstart property
+find .. -name 'pom.xml' -type f -exec sed -i 's#<flink.version>'"$OLD"'</flink.version>#<flink.version>'"$NEW"'</flink.version>#' {} \;
\ No newline at end of file