From 1b40449ac5373e93f8ddb4b3cf46dca2bcc3a900 Mon Sep 17 00:00:00 2001
From: Nico Kruber <nico@data-artisans.com>
Date: Mon, 22 May 2017 12:14:59 +0200
Subject: [PATCH 1/3] [FLINK-6654][build] let 'flink-dist' properly depend on
 'flink-shaded-hadoop2-uber'

---
 flink-dist/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 86923d74ad26b..b86c4ec44d50e 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -43,6 +43,18 @@ under the License.
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-shaded-hadoop2-uber</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.flink</groupId>
+					<artifactId>flink-shaded-hadoop2</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-java</artifactId>

From 9e52e58248e33768bf89dab22b6dc6ddae19190d Mon Sep 17 00:00:00 2001
From: Nico Kruber <nico@data-artisans.com>
Date: Tue, 23 May 2017 09:22:10 +0200
Subject: [PATCH 2/3] [FLINK-6654] address PR comments

---
 flink-dist/pom.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index b86c4ec44d50e..77a3f12ce47ec 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -47,12 +47,10 @@ under the License.
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-shaded-hadoop2-uber</artifactId>
 			<version>${project.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.flink</groupId>
-					<artifactId>flink-shaded-hadoop2</artifactId>
-				</exclusion>
-			</exclusions>
+			<!--
+				Exclusion of flink-shaded-hadoop2 not necessary, dependencies
+				are shaded away properly by flink-shaded-hadoop2-uber.
+			-->
 		</dependency>
 
 		<dependency>

From e25329b9b1b08b94aa6a5976ab3a2fb0dad91dc6 Mon Sep 17 00:00:00 2001
From: Nico Kruber <nico@data-artisans.com>
Date: Wed, 24 May 2017 11:03:02 +0200
Subject: [PATCH 3/3] [FLINK-6654] fix hadoop classes being shaded into
 flink-dist_*.jar

---
 flink-dist/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 77a3f12ce47ec..1caec3d71d816 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -51,6 +51,7 @@ under the License.
 				Exclusion of flink-shaded-hadoop2 not necessary, dependencies
 				are shaded away properly by flink-shaded-hadoop2-uber.
 			-->
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>