camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [1/2] camel git commit: Upgrade Zipkin and related bundle to version 3.7.0
Date Mon, 13 Jun 2016 12:01:22 GMT
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 <ancosen@gmail.com>
Authored: Mon Jun 13 13:43:45 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
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 @@
     <bouncycastle-version>1.54</bouncycastle-version>
     <boxjavalibv2.version>3.2.1</boxjavalibv2.version>
     <braintree-gateway-version>2.63.0</braintree-gateway-version>
-    <brave-zipkin-version>3.6.0</brave-zipkin-version>
-    <brave-zipkin-bundle-version>3.6.0_1</brave-zipkin-bundle-version>
+    <brave-zipkin-version>3.7.0</brave-zipkin-version>
+    <brave-zipkin-bundle-version>3.7.0_1</brave-zipkin-bundle-version>
     <build-helper-maven-plugin-version>1.10</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.2</c3p0-version>
     <caffeine-version>2.3.1</caffeine-version>


Mime
View raw message