flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject git commit: [FLINK-1097] Fixed multiple slf4j bindings when using Hadoop2
Date Wed, 17 Sep 2014 09:12:24 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master 7123c78de -> 244c53903


[FLINK-1097] Fixed multiple slf4j bindings when using Hadoop2

I excluded all slf4j-log4j12 transitive dependencies to get rid off the warning that slf4j
finds multiple slf4j bindings in the classpath. Additionally, I added log4j-over-slf4j and
excluded all log4j transitive dependencies so that slf4j handles also legacy log4j logging
messages from dependencies.

Author: Till Rohrmann <trohrmann@apache.org>

Closes #121 from tillrohrmann/FLINK-1097 and squashes the following commits:

b9f76d5 [Till Rohrmann] Excluded slf4j-log4j12 as transitive dependency in order to not have
multiple slf4j bindings in the class path. Added log4j-overslf4j and excluded log4j transitive
dependencies to collect log4j outputs.


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

Branch: refs/heads/master
Commit: 244c5390394347ded94b01a261cbcf935a006ae2
Parents: 7123c78
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Wed Sep 17 11:11:53 2014 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Wed Sep 17 11:11:53 2014 +0200

----------------------------------------------------------------------
 .gitignore                                      |  1 -
 flink-addons/flink-hadoop-compatibility/pom.xml | 10 +++++++
 flink-addons/flink-hbase/pom.xml                | 16 ++++++++--
 .../flink-streaming-connectors/pom.xml          | 14 +++++++++
 flink-addons/flink-yarn/pom.xml                 | 16 ++++++++++
 pom.xml                                         | 31 +++++++++++++++++++-
 6 files changed, 84 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9c26556..af23bc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 .version.properties
 filter.properties
 logs.zip
-stratosphere-tests/tmp
 target
 tmp
 *.class

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/flink-addons/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml
index a8ebe34..61affa3 100644
--- a/flink-addons/flink-hadoop-compatibility/pom.xml
+++ b/flink-addons/flink-hadoop-compatibility/pom.xml
@@ -75,6 +75,16 @@ under the License.
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-mapreduce-client-core</artifactId>
 					<version>${hadoop.version}</version>
+					<exclusions>
+						<exclusion>
+							<groupId>org.slf4j</groupId>
+							<artifactId>slf4j-log4j12</artifactId>
+						</exclusion>
+						<exclusion>
+							<groupId>log4j</groupId>
+							<artifactId>log4j</artifactId>
+						</exclusion>
+					</exclusions>
 				</dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/flink-addons/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml
index f30e47a..4a8fb0b 100644
--- a/flink-addons/flink-hbase/pom.xml
+++ b/flink-addons/flink-hbase/pom.xml
@@ -72,8 +72,16 @@ under the License.
 				<exclusion>
 					<groupId>org.jruby</groupId>
 					<artifactId>jruby-complete</artifactId>
-					</exclusion>
-				</exclusions> 
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -85,6 +93,10 @@ under the License.
 					<groupId>asm</groupId>
 					<artifactId>asm</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 3974720..ee99d7f 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -61,6 +61,10 @@ under the License.
 					<groupId>com.sun.jdmk</groupId>
 					<artifactId>jmxtools</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -74,6 +78,16 @@ under the License.
 			<groupId>org.apache.flume</groupId>
 			<artifactId>flume-ng-core</artifactId>
 			<version>1.5.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 			<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/flink-addons/flink-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-yarn/pom.xml b/flink-addons/flink-yarn/pom.xml
index f4c97f1..9a107d1 100644
--- a/flink-addons/flink-yarn/pom.xml
+++ b/flink-addons/flink-yarn/pom.xml
@@ -55,6 +55,16 @@ under the License.
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-yarn-client</artifactId>
 			<version>${hadoop.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -73,6 +83,12 @@ under the License.
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-mapreduce-client-core</artifactId>
 			<version>${hadoop.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/244c5390/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6e9edc0..6c42457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@ under the License.
 			 it on the "mvn" commandline in travis. -->
 		<flink.forkCount>1.5C</flink.forkCount>
 		<flink.reuseForks>true</flink.reuseForks>
+		<slf4j.version>1.7.7</slf4j.version>
 	</properties>
 
 	<dependencies>
@@ -88,7 +89,7 @@ under the License.
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
+            <version>${slf4j.version}</version>
         </dependency>
 
         <dependency>
@@ -99,6 +100,12 @@ under the License.
         </dependency>
 
 		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>17.0</version>
@@ -189,16 +196,38 @@ under the License.
 						<groupId>org.apache.hadoop</groupId>
 						<artifactId>hadoop-common</artifactId>
 						<version>${hadoop.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.slf4j</groupId>
+								<artifactId>slf4j-log4j12</artifactId>
+							</exclusion>
+							<exclusion>
+								<groupId>log4j</groupId>
+								<artifactId>log4j</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.apache.hadoop</groupId>
 						<artifactId>hadoop-hdfs</artifactId>
 						<version>${hadoop.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>log4j</groupId>
+								<artifactId>log4j</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 					<dependency>
 						<groupId>org.apache.hadoop</groupId>
 						<artifactId>hadoop-client</artifactId>
 						<version>${hadoop.version}</version>
+						<exclusions>
+							<exclusion>
+								<groupId>org.slf4j</groupId>
+								<artifactId>slf4j-log4j12</artifactId>
+							</exclusion>
+						</exclusions>
 					</dependency>
 				</dependencies>
 			</dependencyManagement>


Mime
View raw message