[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/509f8548 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/509f8548 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/509f8548 Branch: refs/heads/master Commit: 509f85489a3523a42e958062029ebaf3e3e714e4 Parents: 51262c8 Author: Stephan Ewen <[email protected]> Authored: Fri Feb 23 11:10:43 2018 +0100 Committer: Stephan Ewen <[email protected]> Committed: Mon Feb 26 12:25:11 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/509f8548/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/509f8548/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 5828d73..e0f50f1 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.12</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>
