From 5ed99696d261c5359b2e036acfd2aef864f04a7e Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 11 Aug 2016 17:09:18 +0200
Subject: [PATCH] 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>
---
 features/mdsal/src/main/features/features.xml        |  2 +-
 opendaylight/commons/opendaylight/pom.xml            | 12 ------------
 opendaylight/md-sal/sal-clustering-commons/pom.xml   |  4 ++--
 .../md-sal/sal-distributed-datastore/pom.xml         |  4 ++--
 opendaylight/md-sal/sal-remoterpc-connector/pom.xml  | 10 +++++-----
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index a491a46525..b5266f189d 100644
--- 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>
-        <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>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index cbcf4105cb..511b8110dc 100644
--- 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>
-    <!-- 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>
@@ -211,16 +209,6 @@
         <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>
diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index ff18032d82..4c5c620818 100644
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -73,11 +73,11 @@
 
     <!-- Codahale -->
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <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 f59703cc21..b944633017 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -69,11 +69,11 @@
 
     <!-- Codahale -->
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <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 2bb9cdb0bc..de54c31691 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -115,14 +115,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <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>
-- 
2.36.6