camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: Upgrade Zipkin and related bundle to version 3.6.0
Date Tue, 07 Jun 2016 13:30:08 GMT
Repository: camel
Updated Branches:
  refs/heads/master 95d239238 -> 2e504c2ae


Upgrade Zipkin and related bundle to version 3.6.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e504c2a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e504c2a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e504c2a

Branch: refs/heads/master
Commit: 2e504c2ae5e91b4b39ec08125b5f45116d38094b
Parents: 95d2392
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Tue Jun 7 15:29:07 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Tue Jun 7 15:29:07 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/zipkin/ZipkinClientRequestAdapter.java | 1 -
 parent/pom.xml                                                   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2e504c2a/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 ecffa7e..b6998cc 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
@@ -71,7 +71,6 @@ public final class ZipkinClientRequestAdapter implements ClientRequestAdapter
{
         }
     }
 
-    @Override
     public String getClientServiceName() {
         return serviceName;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/2e504c2a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 720148b..3e3c006 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.61.0</braintree-gateway-version>
-    <brave-zipkin-version>3.5.0</brave-zipkin-version>
-    <brave-zipkin-bundle-version>3.5.0_1</brave-zipkin-bundle-version>
+    <brave-zipkin-version>3.6.0</brave-zipkin-version>
+    <brave-zipkin-bundle-version>3.6.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.0</caffeine-version>


Mime
View raw message