[FLINK-6415] [build] Make sure core Flink artifacts have no specific …

…logger dependency
deepfield · May 2, 2017 · e0ba268 · e0ba268
1 parent 9cb7621
commit e0ba268
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git 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>

diff --git 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>

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
@@ -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>

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
@@ -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>

diff --git 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>

diff --git 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>