You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2016/02/29 21:11:01 UTC
flink git commit: [FLINK-3540] Shade org.htrace in
flink-shaded-hadoop to get rid of its Guava dependency
Repository: flink
Updated Branches:
refs/heads/master 9922d10a0 -> 51fc29812
[FLINK-3540] Shade org.htrace in flink-shaded-hadoop to get rid of its Guava dependency
This closes #1737
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/51fc2981
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/51fc2981
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/51fc2981
Branch: refs/heads/master
Commit: 51fc298128405d4ce0e047185ac1c6e5b1753546
Parents: 9922d10
Author: Robert Metzger <rm...@apache.org>
Authored: Mon Feb 29 16:13:02 2016 +0100
Committer: Robert Metzger <rm...@apache.org>
Committed: Mon Feb 29 21:10:28 2016 +0100
----------------------------------------------------------------------
flink-shaded-hadoop/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/51fc2981/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index af49b92..6f4d441 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -117,6 +117,7 @@ under the License.
<include>io.netty:netty:*</include>
<include>org.apache.curator:*</include>
<include>org.apache.hadoop:*</include>
+ <include>org.htrace:htrace-core</include>
<!-- This dependency needs to be included to properly get rid of the HTTP Components dependency -->
<include>net.java.dev.jets3t:jets3t</include>
@@ -152,6 +153,10 @@ under the License.
<pattern>org.apache.commons.httpclient</pattern>
<shadedPattern>org.apache.flink.hadoop.shaded.org.apache.commons.httpclient</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.htrace</pattern>
+ <shadedPattern>org.apache.flink.hadoop.shaded.org.htrace</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>