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 2016/06/27 11:29:53 UTC

camel git commit: Upgrade Vertx to version 3.3.0

Repository: camel
Updated Branches:
  refs/heads/master 5f2e79d81 -> c5fb55c47


Upgrade Vertx to version 3.3.0


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

Branch: refs/heads/master
Commit: c5fb55c47955d343eb28405688f686d02686c3f6
Parents: 5f2e79d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Jun 27 13:29:11 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Jun 27 13:29:11 2016 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 2 +-
 platforms/karaf/features/src/main/resources/features.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c5fb55c4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 42dc8da..d3abd11 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -578,7 +578,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.2.1</vertx-version>
+    <vertx-version>3.3.0</vertx-version>
     <vysper-version>0.7</vysper-version>
     <weld1-version>1.1.28.Final</weld1-version>
     <weld2-version>2.3.4.Final</weld2-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/c5fb55c4/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 816c928..532b330 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1775,9 +1775,14 @@
     <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+    <bundle dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
+    <bundle dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
+    <bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
+    <bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
+    <bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>
     <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle>
     <bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle>
     <bundle dependency='true'>wrap:mvn:io.vertx/vertx-core/${vertx-version}</bundle>