flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [FLINK-3540] Shade org.htrace in flink-shaded-hadoop to get rid of its Guava dependency
Date Mon, 29 Feb 2016 20:11:40 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.0 ae5b4573b -> 74c62b0b8


[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/74c62b0b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/74c62b0b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/74c62b0b

Branch: refs/heads/release-1.0
Commit: 74c62b0b871d271f0dca18b88be64126a53774f6
Parents: ae5b457
Author: Robert Metzger <rmetzger@apache.org>
Authored: Mon Feb 29 16:13:02 2016 +0100
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Mon Feb 29 21:11:24 2016 +0100

----------------------------------------------------------------------
 flink-shaded-hadoop/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/74c62b0b/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 1920737..1e8bdf4 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>


Mime
View raw message