You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/05/24 07:31:42 UTC

[flink-shaded] branch master updated: [hotfix][hadoop] Set findbugs and slf4j-api to provided

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git


The following commit(s) were added to refs/heads/master by this push:
     new f7df449  [hotfix][hadoop] Set findbugs and slf4j-api to provided
f7df449 is described below

commit f7df4493b0946c8bf8c556600b32d593828a9e34
Author: Jincheng Sun <su...@gmail.com>
AuthorDate: Fri May 24 15:31:37 2019 +0800

    [hotfix][hadoop] Set findbugs and slf4j-api to provided
---
 flink-shaded-hadoop-2/pom.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2/pom.xml
index 91451be..dbe96b9 100644
--- a/flink-shaded-hadoop-2/pom.xml
+++ b/flink-shaded-hadoop-2/pom.xml
@@ -41,6 +41,7 @@ under the License.
 		<log4j.version>1.2.17</log4j.version>
 		<hadoop.version>2.4.1</hadoop.version>
 		<zookeeper.version>3.4.10</zookeeper.version>
+		<findbugs.version>1.3.9</findbugs.version>
 	</properties>
 
 	<dependencyManagement>
@@ -54,6 +55,11 @@ under the License.
         -->
 		<dependencies>
 			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>${findbugs.version}</version>
+			</dependency>
+			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
 				<version>1.18</version>
@@ -120,6 +126,11 @@ under the License.
 			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-log4j12</artifactId>
 				<version>${slf4j.version}</version>
 			</dependency>
@@ -158,6 +169,20 @@ under the License.
 	</dependencyManagement>
 
 	<dependencies>
+		<!-- drop dependencies that are already provided by Flink from the shaded / uber jars -->
+		<!--This is provided by Flink -->
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<!--This is provided by Flink -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>