From a8ebe8ce348c544635c996d8538af0ec9113d1b3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 10 Jan 2019 11:32:17 +0100
Subject: [PATCH] Bump mdsal to 3.0.4

This realigns odlparent/yangtools/mdsal and brings in the latest
improvements.

Also upgrade dropwizard-metrics to odlparent-propagated version.

Change-Id: Ic106db810ef170f836fcbfad24032ab348a6bd8c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 benchmark/api/pom.xml                                       | 2 +-
 benchmark/dsbenchmark/pom.xml                               | 2 +-
 benchmark/ntfbenchmark/pom.xml                              | 2 +-
 benchmark/rpcbenchmark/pom.xml                              | 2 +-
 features/benchmark/odl-benchmark-api/pom.xml                | 2 +-
 features/mdsal/odl-clustering-test-app/pom.xml              | 2 +-
 features/mdsal/odl-controller-mdsal-common/pom.xml          | 2 +-
 features/mdsal/odl-controller-model-topology/pom.xml        | 2 +-
 features/mdsal/odl-mdsal-broker-local/pom.xml               | 2 +-
 features/mdsal/odl-mdsal-clustering-commons/pom.xml         | 6 ++++++
 .../src/main/feature/feature.xml                            | 1 +
 features/mdsal/odl-mdsal-model-inventory/pom.xml            | 2 +-
 features/mdsal/odl-message-bus-collector/pom.xml            | 2 +-
 features/mdsal/odl-toaster/pom.xml                          | 2 +-
 karaf/pom.xml                                               | 2 +-
 opendaylight/blueprint/pom.xml                              | 2 +-
 opendaylight/config/pom.xml                                 | 2 +-
 opendaylight/md-sal/parent/pom.xml                          | 2 +-
 opendaylight/md-sal/sal-binding-dom-it/pom.xml              | 2 +-
 opendaylight/md-sal/sal-clustering-commons/pom.xml          | 3 ---
 opendaylight/model/model-inventory/pom.xml                  | 2 +-
 opendaylight/model/model-topology/pom.xml                   | 2 +-
 22 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml
index 17c71004f0..8563ac7a81 100644
--- a/benchmark/api/pom.xml
+++ b/benchmark/api/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index 34dacbbc4b..30fb87b3cb 100644
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml
index 511f555516..56d2d8c58f 100644
--- a/benchmark/ntfbenchmark/pom.xml
+++ b/benchmark/ntfbenchmark/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml
index e1436cc52a..54d148df16 100644
--- a/benchmark/rpcbenchmark/pom.xml
+++ b/benchmark/rpcbenchmark/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml
index de044fa4d0..a09bdfa8b8 100644
--- a/features/benchmark/odl-benchmark-api/pom.xml
+++ b/features/benchmark/odl-benchmark-api/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml
index c426dc35d1..59b4c6df91 100644
--- a/features/mdsal/odl-clustering-test-app/pom.xml
+++ b/features/mdsal/odl-clustering-test-app/pom.xml
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index acdeff9b80..88011bfeb2 100644
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 69f85b4bc7..5564b8f35e 100644
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 2180a0978b..0ce50c2e0b 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -39,7 +39,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 871cd6efa4..7b61cbcae9 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -53,6 +53,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-dropwizard-metrics</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-servlet-api</artifactId>
diff --git a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index faa27f8585..00c2e52f84 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -12,6 +12,7 @@
         <feature version="[4,5)">odl-akka-persistence-2.5</feature>
         <feature version="[4,5)">odl-akka-clustering-2.5</feature>
         <feature version="[4,5)">odl-apache-commons-lang3</feature>
+        <feature version="[4.0.8,5)">odl-dropwizard-metrics</feature>
         <feature version="[4,5)">odl-servlet-api</feature>
     </feature>
 </features>
diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index 68b0d8651c..5872d27847 100644
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index c7723184e8..e7c9a62447 100644
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index 005ecdcd74..9bd61b8020 100644
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index edc45e0cde..1322fe4eb7 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>3.0.3</version>
+      <version>3.0.4</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index e3e4a60210..181f48c97a 100644
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -20,7 +20,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index d9e0d55c25..a7aa83b517 100644
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 5b7ada967d..82525979a6 100644
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 48cb7990d4..15078f0ca3 100644
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index 0136931405..5af44ca567 100644
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -95,17 +95,14 @@
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
-      <version>4.0.3</version>
     </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-graphite</artifactId>
-      <version>4.0.3</version>
     </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-jmx</artifactId>
-      <version>4.0.3</version>
     </dependency>
 
     <!-- Google -->
diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml
index 618326994c..c2dd129a3d 100644
--- a/opendaylight/model/model-inventory/pom.xml
+++ b/opendaylight/model/model-inventory/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml
index 88a7e00c72..4a2b049662 100644
--- a/opendaylight/model/model-topology/pom.xml
+++ b/opendaylight/model/model-topology/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
         <relativePath/>
     </parent>
 
-- 
2.36.6