Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 285DE200B11 for ; Mon, 13 Jun 2016 14:01:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 26FC4160A5B; Mon, 13 Jun 2016 12:01:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 704E9160A19 for ; Mon, 13 Jun 2016 14:01:23 +0200 (CEST) Received: (qmail 48347 invoked by uid 500); 13 Jun 2016 12:01:22 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 48338 invoked by uid 99); 13 Jun 2016 12:01:22 -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, 13 Jun 2016 12:01:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5CFF5E01E2; Mon, 13 Jun 2016 12:01:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Mon, 13 Jun 2016 12:01:22 -0000 Message-Id: <99220edeb958492f9b58847dda55a1e8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] camel git commit: Upgrade Zipkin and related bundle to version 3.7.0 archived-at: Mon, 13 Jun 2016 12:01:24 -0000 Repository: camel Updated Branches: refs/heads/master ceaa05637 -> 92268c1fa Upgrade Zipkin and related bundle to version 3.7.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/520afcee Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/520afcee Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/520afcee Branch: refs/heads/master Commit: 520afcee59f21889e80c0024aed0ec9c58702fc9 Parents: ceaa056 Author: Andrea Cosentino Authored: Mon Jun 13 13:43:45 2016 +0200 Committer: Andrea Cosentino Committed: Mon Jun 13 13:43:45 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/zipkin/ZipkinClientRequestAdapter.java | 5 +++++ parent/pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/520afcee/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java index b6998cc..a5aa944 100644 --- a/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java +++ b/components/camel-zipkin/src/main/java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java @@ -101,4 +101,9 @@ public final class ZipkinClientRequestAdapter implements ClientRequestAdapter { } return list; } + + @Override + public com.twitter.zipkin.gen.Endpoint serverAddress() { + return null; + } } http://git-wip-us.apache.org/repos/asf/camel/blob/520afcee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0e4127b..5fa12c9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -78,8 +78,8 @@ 1.54 3.2.1 2.63.0 - 3.6.0 - 3.6.0_1 + 3.7.0 + 3.7.0_1 1.10 0.9.5.2 2.3.1