Return-Path: 
 <commits-return-6765-apmail-flink-commits-archive=flink.apache.org@flink.apache.org>
X-Original-To: apmail-flink-commits-archive@minotaur.apache.org
Delivered-To: apmail-flink-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3F54B18889
	for <apmail-flink-commits-archive@minotaur.apache.org>;
 Mon, 29 Feb 2016 20:11:08 +0000 (UTC)
Received: (qmail 11144 invoked by uid 500); 29 Feb 2016 20:11:02 -0000
Delivered-To: apmail-flink-commits-archive@flink.apache.org
Received: (qmail 11093 invoked by uid 500); 29 Feb 2016 20:11:01 -0000
Mailing-List: contact commits-help@flink.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flink.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flink.apache.org>
List-Post: <mailto:commits@flink.apache.org>
List-Id: <commits.flink.apache.org>
Reply-To: dev@flink.apache.org
Delivered-To: mailing list commits@flink.apache.org
Received: (qmail 11084 invoked by uid 99); 29 Feb 2016 20:11:01 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Feb 2016 20:11:01 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 860A0E0446; Mon, 29 Feb 2016 20:11:01 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rmetzger@apache.org
To: commits@flink.apache.org
Message-Id: <bc399399f5634ec5bfe5c4dffa9d43e7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
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:01 +0000 (UTC)

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 <rmetzger@apache.org>
Authored: Mon Feb 29 16:13:02 2016 +0100
Committer: Robert Metzger <rmetzger@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>