flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject [1/3] flink git commit: [FLINK-6836] [tests] Fix YARNSessionCapacitySchedulerITCase to work with Hadoop 2.6.5, 2.7.3 and 2.8.0
Date Wed, 21 Jun 2017 03:51:12 GMT
Repository: flink
Updated Branches:
  refs/heads/master be662bf7e -> 0c4f7988d


[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.

Bump httpclient to 4.5.3 and httpcore to 4.4.6

This closes #4120.


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

Branch: refs/heads/master
Commit: 6fdeed326ec7221c51e1f2a8f235ed0b8c58c6cc
Parents: be662bf
Author: Till Rohrmann <trohrmann@apache.org>
Authored: Tue Jun 13 23:26:10 2017 +0200
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Wed Jun 21 11:33:12 2017 +0800

----------------------------------------------------------------------
 flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml | 16 ----------------
 pom.xml                                          | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/6fdeed32/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 74754c3..ff6f84d 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 -->

http://git-wip-us.apache.org/repos/asf/flink/blob/6fdeed32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b846b26..5fb895d 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.4.6</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.5.3</version>
+			</dependency>
+
 			<dependency>
 				<groupId>tv.cntt</groupId>
 				<artifactId>netty-router</artifactId>


Mime
View raw message