camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: Upgraded vertx
Date Sat, 08 Nov 2014 15:20:25 GMT
Repository: camel
Updated Branches:
  refs/heads/master b2851eab7 -> 36e3c9d16


Upgraded vertx


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

Branch: refs/heads/master
Commit: f12975688a90d0e49bbb11c8f25ed29f449a9d92
Parents: b2851ea
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Nov 8 16:00:39 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Nov 8 16:00:39 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/camel/blob/f1297568/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8a59734..170f1ca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -445,7 +445,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>2.1.2</vertx-version>
+    <vertx-version>2.1.4</vertx-version>
     <vysper-version>0.7</vysper-version>
     <weld2-version>2.2.4.Final</weld2-version>
     <werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/f1297568/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 87fa3d0..2c2551c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1345,6 +1345,7 @@
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-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>
     <!-- TODO: vertx is not OSGi bundle, see https://github.com/eclipse/vert.x/issues/708
-->
     <bundle dependency='true'>wrap:mvn:io.vertx/vertx-core/${vertx-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>


Mime
View raw message