BUG-6341: use common Coda Hale Metrics

This depends on https://git.opendaylight.org/gerrit/43717

Change-Id: I39f26964836b3c2b2fd4e54f06b8761743812b12
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index a491a46525c0669d91c80839f620153048712afc..b5266f189d9b6aab1af455f6ea8c0b77516ceb06 100644 (file)
--- a/features/mdsal/src/main/features/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -80,7 +80,7 @@
         <feature version='[2.4.1,2.5.0)'>odl-akka-clustering</feature>
         <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>
         <feature version='[2.4.1,2.5.0)'>odl-akka-clustering</feature>
         <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>

-        <bundle>mvn:com.codahale.metrics/metrics-core/3.0.1</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-core/{{VERSION}}</bundle>

     </feature>
     <feature name ='odl-mdsal-distributed-datastore' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
     </feature>
     <feature name ='odl-mdsal-distributed-datastore' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index cbcf4105cb4c6baee7a45dc58aab80ff0aa5e25b..511b8110dc53bf14a9c5acd668dd72d6020c5447 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -27,8 +27,6 @@
     <clustering.stub.version>0.8.0-SNAPSHOT</clustering.stub.version>
     <clustering.test.version>0.8.0-SNAPSHOT</clustering.test.version>
     <commmons.northbound.version>0.8.0-SNAPSHOT</commmons.northbound.version>
     <clustering.stub.version>0.8.0-SNAPSHOT</clustering.stub.version>
     <clustering.test.version>0.8.0-SNAPSHOT</clustering.test.version>
     <commmons.northbound.version>0.8.0-SNAPSHOT</commmons.northbound.version>

-    <!-- Third Party Versions -->
-    <codahale.metrics.version>3.0.1</codahale.metrics.version>

 
     <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
     <commons.logback_settings.version>0.4.0-SNAPSHOT</commons.logback_settings.version>
 
     <commons.httpclient.version>0.5.0-SNAPSHOT</commons.httpclient.version>
     <commons.logback_settings.version>0.4.0-SNAPSHOT</commons.logback_settings.version>


@@ -211,16 +209,6 @@
         <artifactId>sshd-core</artifactId>
         <version>0.14.0</version>
       </dependency>
         <artifactId>sshd-core</artifactId>
         <version>0.14.0</version>
       </dependency>

-      <dependency>
-        <groupId>com.codahale.metrics</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${codahale.metrics.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.codahale.metrics</groupId>
-        <artifactId>metrics-graphite</artifactId>
-        <version>${codahale.metrics.version}</version>
-      </dependency>

 
       <!-- 3rd party dependencies needed by config-->
       <dependency>
 
       <!-- 3rd party dependencies needed by config-->
       <dependency>

diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index ff18032d8203c88fe670bee82f97317a1508a64a..4c5c62081814b2e3c4f879de8470643daab46714 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -73,11 +73,11 @@
 
     <!-- Codahale -->
     <dependency>
 
     <!-- Codahale -->
     <dependency>

-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>

       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>
       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>

-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>

       <artifactId>metrics-graphite</artifactId>
     </dependency>
 
       <artifactId>metrics-graphite</artifactId>
     </dependency>
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index f59703cc21d89bbf2fac91b6be93084fd222ddcc..b9446330177b68dbcf530d26ff40bdfee657541b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -69,11 +69,11 @@
 
     <!-- Codahale -->
     <dependency>
 
     <!-- Codahale -->
     <dependency>

-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>

       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>
       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>

-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>

       <artifactId>metrics-graphite</artifactId>
     </dependency>
 
       <artifactId>metrics-graphite</artifactId>
     </dependency>
 

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 2bb9cdb0bc23a2cf38ce6a36cfd341601141aa66..de54c316919b4e5a472bde78b9e2b68b1326f697 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -115,14 +115,14 @@
     </dependency>
 
     <dependency>
     </dependency>
 
     <dependency>

-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>

       <artifactId>metrics-core</artifactId>
     </dependency>
 
       <artifactId>metrics-core</artifactId>
     </dependency>
 

-      <dependency>
-          <groupId>com.codahale.metrics</groupId>
-          <artifactId>metrics-graphite</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-graphite</artifactId>
+    </dependency>

     <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>
     <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>