[camel] branch master updated: Use the same version of Metrics for Camel-CassandraQL too

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 359aa13  Use the same version of Metrics for Camel-CassandraQL too
359aa13 is described below

commit 359aa139679b143fc6853dc23561d7690c1b9f93
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 11 14:35:51 2018 +0200

    Use the same version of Metrics for Camel-CassandraQL too
---
 parent/pom.xml                                           | 1 -
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 949cf18..1aa665e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -108,7 +108,6 @@
     <californium-version>1.0.6</californium-version>
     
<camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
     <cassandra-driver-version>3.4.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>
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 0ba462d..b6080c2 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -318,8 +318,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/${cassandra-metrics-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${cassandra-metrics-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: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>

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.