You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/03/07 09:06:13 UTC
[1/2] camel git commit: Upgrade Vertx to version 3.4.0
Repository: camel
Updated Branches:
refs/heads/master efdf259da -> c26049985
Upgrade Vertx to version 3.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2604998
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2604998
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2604998
Branch: refs/heads/master
Commit: c2604998569482aad4736c970037e663748124cd
Parents: f0866ee
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Mar 7 10:05:26 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Mar 7 10:05:45 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/vertx/VertxComponent.java | 4 ++--
parent/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2604998/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
index 06d2f0b..a1f7e9e 100644
--- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
+++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import io.vertx.core.AsyncResult;
-import io.vertx.core.AsyncResultHandler;
+import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import io.vertx.core.impl.VertxFactoryImpl;
@@ -172,7 +172,7 @@ public class VertxComponent extends UriEndpointComponent implements EndpointComp
if (vertxOptions.isClustered()) {
LOG.info("Creating Clustered Vertx {}:{}", vertxOptions.getClusterHost(), vertxOptions.getClusterPort());
// use the async api as we want to wait for the eventbus to be ready before we are in started state
- vertxFactory.clusteredVertx(vertxOptions, new AsyncResultHandler<Vertx>() {
+ vertxFactory.clusteredVertx(vertxOptions, new Handler<AsyncResult<Vertx>>() {
@Override
public void handle(AsyncResult<Vertx> event) {
if (event.cause() != null) {
http://git-wip-us.apache.org/repos/asf/camel/blob/c2604998/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 38b4045..fe55028 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -638,7 +638,7 @@
<velocity-bundle-version>1.7_6</velocity-bundle-version>
<velocity-tools-version>2.0</velocity-tools-version>
<velocity-version>1.7</velocity-version>
- <vertx-version>3.3.3</vertx-version>
+ <vertx-version>3.4.0</vertx-version>
<vysper-version>0.7</vysper-version>
<weld1-version>1.1.28.Final</weld1-version>
<weld2-version>2.4.2.Final</weld2-version>
[2/2] camel git commit: Upgrade Docker Java to version 3.0.8
Posted by ac...@apache.org.
Upgrade Docker Java to version 3.0.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f0866ee6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f0866ee6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f0866ee6
Branch: refs/heads/master
Commit: f0866ee6347d7ed7d3d0d88f8ffc3490d1f4bc23
Parents: efdf259
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Mar 7 09:59:08 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Mar 7 10:05:45 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f0866ee6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d726ddb..38b4045 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -162,7 +162,7 @@
<disruptor-version>3.3.6</disruptor-version>
<dnsjava-version>2.1.8</dnsjava-version>
<dnsjava-bundle-version>2.1.8_1</dnsjava-bundle-version>
- <docker-java-version>3.0.7</docker-java-version>
+ <docker-java-version>3.0.8</docker-java-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.5.1</dozer-version>
<drools-version>6.5.0.Final</drools-version>