From a684e23703033358de2f5c87f2ecd4bb0cbd4898 Mon Sep 17 00:00:00 2001
From: Robert Metzger <rmetzger@apache.org>
Date: Mon, 9 Nov 2015 15:30:19 +0100
Subject: [PATCH] [FLINK-2987] Remove jersey-core and jersey-client dependency
 exclusion to make Flink on Hadoop 2.6.0+ work

This closes #1340
---
 .../flink-shaded-hadoop2/pom.xml              | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 74a64e12514..bbaf1297418 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -88,10 +88,6 @@ under the License.
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jetty-util</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-json</artifactId>
@@ -128,10 +124,6 @@ under the License.
 					<groupId>javax.servlet</groupId>
 					<artifactId>javax.servlet-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-grizzly2</artifactId>
@@ -220,10 +212,6 @@ under the License.
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jetty-util</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-json</artifactId>
@@ -260,10 +248,6 @@ under the License.
 					<groupId>javax.servlet</groupId>
 					<artifactId>javax.servlet-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-grizzly2</artifactId>
@@ -364,10 +348,6 @@ under the License.
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jetty-util</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-json</artifactId>
@@ -404,10 +384,6 @@ under the License.
 					<groupId>javax.servlet</groupId>
 					<artifactId>javax.servlet-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-grizzly2</artifactId>
@@ -508,10 +484,6 @@ under the License.
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jetty-util</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-json</artifactId>
@@ -548,10 +520,6 @@ under the License.
 					<groupId>javax.servlet</groupId>
 					<artifactId>javax.servlet-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-grizzly2</artifactId>
@@ -652,10 +620,6 @@ under the License.
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>jetty-util</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-core</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-json</artifactId>
@@ -692,10 +656,6 @@ under the License.
 					<groupId>javax.servlet</groupId>
 					<artifactId>javax.servlet-api</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jersey</groupId>
-					<artifactId>jersey-client</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>com.sun.jersey</groupId>
 					<artifactId>jersey-grizzly2</artifactId>
-- 
GitLab