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 Etcd4j to version 2.12.0
Date Tue, 02 Aug 2016 07:50:52 GMT
Repository: camel
Updated Branches:
  refs/heads/master b5a479232 -> 1f1b47be4


Upgrade Etcd4j to version 2.12.0


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

Branch: refs/heads/master
Commit: 1f1b47be470f66f1b8ec521c5957bff9d9091610
Parents: b5a4792
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Tue Aug 2 09:49:51 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Tue Aug 2 09:50:27 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/1f1b47be/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ccf41a4..57054ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -175,7 +175,7 @@
     <el-api-1.0-version>1.0.1</el-api-1.0-version>
     <!-- embedmongo 1.50.2 do not work -->
     <embedmongo-version>1.50.1</embedmongo-version>
-    <etcd4j-version>2.11.0</etcd4j-version>
+    <etcd4j-version>2.12.0</etcd4j-version>
     <exec-maven-plugin-version>1.5.0</exec-maven-plugin-version>
     <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
     <facebook4j-core-version>2.4.4</facebook4j-core-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/1f1b47be/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 d9b099f..a0834b7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -478,10 +478,12 @@
     <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-buffer/${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:io.netty/netty-transport/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-handler/${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-dns/${netty-version}</bundle>
     <bundle dependency='true'>mvn:org.mousio/etcd4j/${etcd4j-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-etcd/${project.version}</bundle>
   </feature>


Mime
View raw message