Revert "Bump dropwizard-metrics to 4.2.21"

This reverts commit 03090030e4532c2e690f200590b5c0e4393f5dc3, as it
breaks metrics-graphite in OSGi environments.

Change-Id: I06ff2480f1b4e15b7e26c29d805c9b25c0fadd44
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d59d72345157a0f55bf7c2bcefee5d9115a43dbd)

diff --git a/features/odl-dropwizard-metrics/src/main/history/dependencies.xml b/features/odl-dropwizard-metrics/src/main/history/dependencies.xml
index ff27ca14349bab6ba8cb1cd774de79165fafd691..e6d2b27c64731373c5415a0a31275aa26cccb6e9 100644 (file)
--- a/features/odl-dropwizard-metrics/src/main/history/dependencies.xml
+++ b/features/odl-dropwizard-metrics/src/main/history/dependencies.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-dropwizard-metrics">
     <feature version="0.0.0">
-        <bundle>mvn:io.dropwizard.metrics/metrics-core/4.2.21</bundle>
-        <bundle>mvn:io.dropwizard.metrics/metrics-healthchecks/4.2.21</bundle>
-        <bundle>mvn:io.dropwizard.metrics/metrics-jmx/4.2.21</bundle>
-        <bundle>mvn:io.dropwizard.metrics/metrics-jvm/4.2.21</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-core/4.2.20</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-healthchecks/4.2.20</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-jmx/4.2.20</bundle>
+        <bundle>mvn:io.dropwizard.metrics/metrics-jvm/4.2.20</bundle>
     </feature>
 </features>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 9c95367cefe128984db4e2640b9ac4db83b47080..8b4814c3dc163a6a30056d4482f8f3c73efdf79e 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -95,7 +95,7 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-bom</artifactId>
             <type>pom</type>
-            <version>4.2.21</version>
+            <version>4.2.20</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 42c7c187925fc256091dc5ec72ad936951e1b45e..5a203e7ba18582e2f15ca0575618e6154a05e7c6 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -721,7 +721,7 @@
       <dependency>
         <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-bom</artifactId>
-        <version>4.2.21</version>
+        <version>4.2.20</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>