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/08/30 09:37:33 UTC

camel git commit: Camel-Cassandraql Karaf Feature needs Metrics 3.2.x to work

Repository: camel
Updated Branches:
  refs/heads/master 7e33dd19b -> 85183c149


Camel-Cassandraql Karaf Feature needs Metrics 3.2.x to work


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

Branch: refs/heads/master
Commit: 85183c149014039915e6e06e665a84187df4491a
Parents: 7e33dd1
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Aug 30 11:36:43 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Aug 30 11:36:43 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/85183c14/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 64cd3c1..78bb7cd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,6 +106,7 @@
     <californium-version>1.0.6</californium-version>
     <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
     <cassandra-driver-version>3.3.0</cassandra-driver-version>
+    <cassandra-metrics-version>3.2.2</cassandra-metrics-version>
     <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version>
     <cassandra-version>3.7</cassandra-version>
     <cassandra-unit-version>3.1.3.2</cassandra-unit-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/85183c14/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 365b488..ea5989d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -294,8 +294,8 @@
     <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
     <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
-    <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
-    <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle>
+    <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cassandra-metrics-version}</bundle>
+    <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${cassandra-metrics-version}</bundle>
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
     <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>