[camel-karaf] branch master updated: Use a specific property placeholder for cassandra dropwizard metrics

[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-karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 41d4521  Use a specific property placeholder for cassandra dropwizard 
metrics
41d4521 is described below

commit 41d4521c39be69658fd2accd811978b1360d1331
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 1 09:12:20 2020 +0200

    Use a specific property placeholder for cassandra dropwizard metrics
---
 platforms/karaf/features/src/main/resources/features.xml | 4 ++--
 pom.xml                                                  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index d012fb1..c113edf 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -651,8 +651,8 @@
     <bundle 
dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
     <bundle 
dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
     <!-- need older metrics version -->
-    <bundle 
dependency='true'>mvn:io.dropwizard.metrics/metrics-core/3.2.6</bundle>
-    <bundle 
dependency='true'>mvn:io.dropwizard.metrics/metrics-json/3.2.6</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>
diff --git a/pom.xml b/pom.xml
index 2706fc7..0e0aa4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +181,7 @@
         <caffeine-version>2.8.1</caffeine-version>
         <californium-version>2.0.0</californium-version>
         <cassandra-driver-version>3.7.2</cassandra-driver-version>
+        <cassandra-metrics-version>3.2.6</cassandra-metrics-version>
         <cassandra-driver-guava-version>19.0</cassandra-driver-guava-version>
         <cassandra-version>3.7</cassandra-version>
         <cassandra-unit-version>3.1.3.2</cassandra-unit-version>