From 9cc7e283be5120d1b8d7b30b41e887382bd6d3bd Mon Sep 17 00:00:00 2001
From: Till Rohrmann <trohrmann@apache.org>
Date: Tue, 13 Jun 2017 23:26:10 +0200
Subject: [PATCH 1/2] [FLINK-6836] [tests] Fix
 YARNSessionCapacitySchedulerITCase to work with Hadoop 2.6.5, 2.7.3 and 2.8.0

Due to MNG-5899, maven cannot resolve dependency reduced poms in a multi project build. Therefore,
flink-yarn-tests pulls in a wrong version of org.apache.httpcomponents.httpclient which does not work
with Hadoop's ServletUtils together. As a solution we have to move the dependency management for the
httpclient and httpcore version into the parent pom.xml.

Another problem is the version of these libraries which has been recently bumped. In 4.4, httpclient
changed its behaviour such that URLEncodedUtils#parse(String, Charset) now throws a NPE if the first
parameter is null. In 4.2.6, an empty list was returned instead. Due to this incompatibility, we reverted
the change and set the version to its previous value.
---
 flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml | 16 ----------------
 pom.xml                                          | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 74754c3ba3fc9..ff6f84d541db7 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -676,22 +676,6 @@ under the License.
 		</dependency>
 	</dependencies>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpcore</artifactId>
-				<version>4.4.4</version>
-			</dependency>
-
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.2</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<profiles>
 		<profile>
 			<!-- MapR build profile -->
diff --git a/pom.xml b/pom.xml
index b846b26fb26c5..d2cd4d4df94fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,6 +445,22 @@ under the License.
 				<version>4.0.27.Final</version>
 			</dependency>
 
+			<!-- We have to define the versions for httpcore and httpclient here such that a consistent
+			 version is used by the shaded hadoop jars and the flink-yarn-test project because of MNG-5899.
+
+			 See FLINK-6836 for more details -->
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpcore</artifactId>
+				<version>4.2.5</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.2.6</version>
+			</dependency>
+
 			<dependency>
 				<groupId>tv.cntt</groupId>
 				<artifactId>netty-router</artifactId>

From f399f9a7dfb2e097a9148a28cdd4570179f232bb Mon Sep 17 00:00:00 2001
From: Till Rohrmann <trohrmann@apache.org>
Date: Thu, 15 Jun 2017 00:22:24 +0200
Subject: [PATCH 2/2] Bump httpclient to 4.5.3 and httpcore to 4.4.6

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2cd4d4df94fd..5fb895d17799f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -452,13 +452,13 @@ under the License.
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpcore</artifactId>
-				<version>4.2.5</version>
+				<version>4.4.6</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.2.6</version>
+				<version>4.5.3</version>
 			</dependency>
 
 			<dependency>