You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2018/02/28 10:57:25 UTC
[5/9] flink git commit: [FLINK-8765] [quickstarts] Simplify
quickstart properties
[FLINK-8765] [quickstarts] Simplify quickstart properties
This does not pull out the slf4j and log4j version into properties any more,
making the quickstarts a bit simpler.
Given that both versions are used only once, and only for the feature to have
convenience logging in the IDE, the versions might as well be defined directly
in the dependencies.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/11e19a56
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/11e19a56
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/11e19a56
Branch: refs/heads/release-1.4
Commit: 11e19a56bfdedb4f41ecc3dcf1cd4120191cdb1a
Parents: fa30638
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Feb 23 11:10:43 2018 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Feb 28 11:43:01 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 6 ++----
.../src/main/resources/archetype-resources/pom.xml | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/11e19a56/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 6ac05b0..50b0351 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
@@ -31,8 +31,6 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
@@ -82,13 +80,13 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>1.2.17</version>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/11e19a56/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 b318a19..4a866c3 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
@@ -46,8 +46,6 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<flink.version>@project.version@</flink.version>
- <slf4j.version>@slf4j.version@</slf4j.version>
- <log4j.version>@log4j.version@</log4j.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.version>2.11.11</scala.version>
</properties>
@@ -92,13 +90,13 @@ under the License.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
+ <version>1.7.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <version>1.2.17</version>
<scope>runtime</scope>
</dependency>
</dependencies>