Repository: flink Updated Branches: refs/heads/master aeee6efd4 -> 8ccd7544e
[FLINK-3373] [build] Shade away Hadoop's HTTP Components dependency This closes #1615 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8ccd7544 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8ccd7544 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8ccd7544 Branch: refs/heads/master Commit: 8ccd7544edb25e82cc8a898809cc7c8bb7893620 Parents: aeee6ef Author: Stephan Ewen <se...@apache.org> Authored: Tue Feb 9 21:18:43 2016 +0100 Committer: Stephan Ewen <se...@apache.org> Committed: Wed Feb 10 15:01:22 2016 +0100 ---------------------------------------------------------------------- flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml | 15 +++++++++++++++ flink-shaded-hadoop/pom.xml | 13 +++++++++++++ pom.xml | 12 ------------ 3 files changed, 28 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/8ccd7544/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 b5839d9..5eb8043 100644 --- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml +++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml @@ -652,4 +652,19 @@ under the License. </dependency> </dependencies> + <dependencyManagement> + <dependencies> + <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> + </dependencies> + </dependencyManagement> </project> http://git-wip-us.apache.org/repos/asf/flink/blob/8ccd7544/flink-shaded-hadoop/pom.xml ---------------------------------------------------------------------- diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml index 7d54ef9..d5a8529 100644 --- a/flink-shaded-hadoop/pom.xml +++ b/flink-shaded-hadoop/pom.xml @@ -111,6 +111,11 @@ under the License. <include>io.netty:netty:*</include> <include>org.apache.curator:*</include> <include>org.apache.hadoop:*</include> + + <!-- This dependency needs to be included to properly get rid of the HTTP Components dependency --> + <include>net.java.dev.jets3t:jets3t</include> + <include>org.apache.httpcomponents:*</include> + <include>commons-httpclient:commons-httpclient</include> </includes> </artifactSet> <relocations> @@ -133,6 +138,14 @@ under the License. <pattern>org.apache.curator</pattern> <shadedPattern>org.apache.flink.hadoop.shaded.org.apache.curator</shadedPattern> </relocation> + <relocation> + <pattern>org.apache.http</pattern> + <shadedPattern>org.apache.flink.hadoop.shaded.org.apache.http</shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.commons.httpclient</pattern> + <shadedPattern>org.apache.flink.hadoop.shaded.org.apache.commons.httpclient</shadedPattern> + </relocation> </relocations> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/flink/blob/8ccd7544/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0a64c4a..42ebf79 100644 --- a/pom.xml +++ b/pom.xml @@ -342,18 +342,6 @@ under the License. </dependency> <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>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <version>${jackson.version}</version>
