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 2017/05/02 21:47:24 UTC
[2/8] flink git commit: [FLINK-6415] [build] Make sure core Flink
artifacts have no specific logger dependency
[FLINK-6415] [build] Make sure core Flink artifacts have no specific logger dependency
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e0ba2687
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e0ba2687
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e0ba2687
Branch: refs/heads/master
Commit: e0ba2687fbf77b758d85ad9cf0755b13c8a112db
Parents: 9cb7621
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Apr 28 16:52:03 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue May 2 22:49:45 2017 +0200
----------------------------------------------------------------------
flink-core/pom.xml | 20 --------------------
flink-dist/pom.xml | 6 +++---
.../main/resources/archetype-resources/pom.xml | 2 +-
.../main/resources/archetype-resources/pom.xml | 2 +-
.../flink-test-utils/pom.xml | 10 ++++++++++
pom.xml | 10 ++++++++++
6 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index 0a0d06e..1efcb29 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -95,26 +95,6 @@ under the License.
<version>${asm.version}</version>
</dependency>
- <!--
- Because there are no logger implementation dependency in the root pom, we
- add them here so that they are available during execution of code (core
- and example) in the IDE
-
- NOTE: Once we are confident that users will use the newer quickstart templates,
- we can drop these dependencies and only add them to 'flink-dist' and as test
- dependencies
- -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<!-- ================== test dependencies ================== -->
<dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index a700870..507e78d 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -139,9 +139,9 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Concrete logging framework - we only add this here to not tie
- the projects to one specific framework and make it easier for
- users to swap logging frameworks -->
+ <!-- Concrete logging framework - we add this only here (and not in the
+ root POM to not tie the projects to one specific framework and make
+ it easier for users to swap logging frameworks -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/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 6ae8f16..1e525fd 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
@@ -91,7 +91,7 @@ under the License.
<version>${flink.version}</version>
</dependency>
- <!-- explicitly add a standard loggin framework, as Flink does not (in the future) have
+ <!-- explicitly add a standard loggin framework, as Flink does not have
a hard dependency on one specific framework by default -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/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 699a739..5abe496 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
@@ -92,7 +92,7 @@ under the License.
<version>${flink.version}</version>
</dependency>
- <!-- explicitly add a standard loggin framework, as Flink does not (in the future) have
+ <!-- explicitly add a standard loggin framework, as Flink does not have
a hard dependency on one specific framework by default -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/flink-test-utils-parent/flink-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml
index 069f1da..14fca07 100644
--- a/flink-test-utils-parent/flink-test-utils/pom.xml
+++ b/flink-test-utils-parent/flink-test-utils/pom.xml
@@ -90,6 +90,16 @@ under the License.
on its own as well as include maven-bundle-plugin.
-->
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flink/blob/e0ba2687/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 874bead..f822198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,6 +414,16 @@ under the License.
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>