flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aljos...@apache.org
Subject [2/3] flink git commit: [FLINK-7281] Make quickstart versions depend on project versions
Date Fri, 28 Jul 2017 19:38:43 GMT
[FLINK-7281] Make quickstart versions depend on project versions


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f1c92f23
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f1c92f23
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f1c92f23

Branch: refs/heads/master
Commit: f1c92f2367183d7e215466b3ff227fff11efc470
Parents: 50a818b
Author: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Authored: Tue Jul 25 15:30:26 2017 +0200
Committer: Aljoscha Krettek <aljoscha.krettek@gmail.com>
Committed: Fri Jul 28 21:28:48 2017 +0200

----------------------------------------------------------------------
 .../src/main/resources/archetype-resources/pom.xml           | 6 +++---
 .../src/main/resources/archetype-resources/pom.xml           | 6 +++---
 pom.xml                                                      | 8 +++++---
 tools/create_release_files.sh                                | 3 ---
 4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/f1c92f23/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 44c56b9..7409329 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,9 +30,9 @@ under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<flink.version>1.4-SNAPSHOT</flink.version>
-		<slf4j.version>1.7.7</slf4j.version>
-		<log4j.version>1.2.17</log4j.version>
+		<flink.version>@project.version@</flink.version>
+		<slf4j.version>@slf4j.version@</slf4j.version>
+		<log4j.version>@log4j.version</log4j.version>
 		<scala.binary.version>@scala.binary.version@</scala.binary.version>
 	</properties>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/f1c92f23/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 ff33a6e..cddaf45 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,9 +45,9 @@ under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<flink.version>1.4-SNAPSHOT</flink.version>
-		<slf4j.version>1.7.7</slf4j.version>
-		<log4j.version>1.2.17</log4j.version>
+		<flink.version>@project.version@</flink.version>
+		<slf4j.version>@slf4j.version@</slf4j.version>
+		<log4j.version>@log4j.version</log4j.version>
 		<scala.binary.version>@scala.binary.version@</scala.binary.version>
 	</properties>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/f1c92f23/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b7a9112..93d0470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,8 @@ under the License.
 		<guava.version>18.0</guava.version>
 		<akka.version>2.3-custom</akka.version>
 		<java.version>1.7</java.version>
+		<slf4j.version>1.7.7</slf4j.version>
+		<log4j.version>1.2.17</log4j.version>
 		<!-- Overwrite default values from parent pom.
 			 Intellij is (sometimes?) using those values to choose target language level
 			 and thus is changing back to java 1.6 on each maven re-import -->
@@ -231,19 +233,19 @@ under the License.
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
-				<version>1.7.7</version>
+				<version>${slf4j.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
-				<version>1.7.7</version>
+				<version>${slf4j.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>log4j</groupId>
 				<artifactId>log4j</artifactId>
-				<version>1.2.17</version>
+				<version>${log4j.version}</version>
 			</dependency>
 
 			<dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/f1c92f23/tools/create_release_files.sh
----------------------------------------------------------------------
diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh
index 663b634..48641c0 100755
--- a/tools/create_release_files.sh
+++ b/tools/create_release_files.sh
@@ -175,9 +175,6 @@ make_source_release() {
   #change version in all pom files
   find . -name 'pom.xml' -type f -exec perl -pi -e 's#<version>'$OLD_VERSION'</version>#<version>'$NEW_VERSION'</version>#'
{} \;
 
-  #change version in quickstart archetypes
-  find . -name 'pom.xml' -type f -exec perl -pi -e 's#<flink.version>'$OLD_VERSION'</flink.version>#<flink.version>'$NEW_VERSION'</flink.version>#'
{} \;
-
   #change version of documentation
   cd docs
   perl -pi -e "s#^version: .*#version: ${NEW_VERSION}#" _config.yml


Mime
View raw message