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>

diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml
index 17c71004f0dc6877ec6482888b2091a1f3c9a794..8563ac7a81ef4679cc53ba095ff388bbb12c08c0 100644 (file)
--- 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 34dacbbc4b5b681aec748dd00339ba12467230e4..30fb87b3cbe8744eab08fe0ea294686e13f70b9f 100644 (file)
--- 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 511f5555162bf1d2da00ac94f770900533156bba..56d2d8c58f008a2cd12feb0eac8d4e4c555f1180 100644 (file)
--- 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 e1436cc52aebc92b321c1a2758989d7196a12239..54d148df166e837e4e6248f3bd7470447f6a3405 100644 (file)
--- 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 de044fa4d0d78b2a58f5f5f8a8f27da5cd8e2478..a09bdfa8b8858d8a57e689bbcacc5c1f769014db 100644 (file)
--- 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 c426dc35d1627f73a8d2f7544187a9b90cd1f6fe..59b4c6df9123e9e5f580e7cafe7f0af0502aebea 100644 (file)
--- 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 acdeff9b80cfe07b1438ce478c40f125c7fec51d..88011bfeb2e00201b887fd6278d39e5fc03426d8 100644 (file)
--- 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 69f85b4bc77200bb8e6755aea2a6423310052839..5564b8f35eeec6f34a77982f317389bdc72fa9f5 100644 (file)
--- 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 2180a0978bdfed979204a86d5787db98effde909..0ce50c2e0b88856509b6af25ff75d6d10bc3c8ce 100644 (file)
--- 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 871cd6efa4b3229f1ec477ee7fcd5f2c6617c872..7b61cbcae950390717e89ef9aedfed54b3d9762e 100644 (file)
--- 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 faa27f8585c33e2b55d720d8c03f7c6bb81116f0..00c2e52f848463659d0f89fad9eb31b9d26e08ab 100644 (file)
--- 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 68b0d8651c1755e1084133d33d21910b6f835365..5872d27847dc9342fe6b7f28aac26bc6c94403b4 100644 (file)
--- 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 c7723184e801da992f4a70dfa3a43003e248e3dc..e7c9a6244747fba194b2f1b5f25269f50988ce89 100644 (file)
--- 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 005ecdcd74b0119c7fb3e64fd3046ba07e9e0094..9bd61b80205ca10fa894a3ee2dd356551d14f13f 100644 (file)
--- 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 edc45e0cde2504632389897a92c4b24dbf969400..1322fe4eb75f2b8bfdafc6d109c8c00ba4cd8c61 100644 (file)
--- 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 e3e4a602103d414cf613a4f84bfed530f27ccdd4..181f48c97a9109891e4fa77e6e29104855b5f5e9 100644 (file)
--- 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 d9e0d55c259375d83f389c15cec5a4ecb1a724be..a7aa83b517928ad3a1b1df0ee3b4d615d5974da5 100644 (file)
--- 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 5b7ada967d57a6e511c4958363dde58f2648f3fb..82525979a68cdf47ecb372527fb54e147e53c6a7 100644 (file)
--- 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 48cb7990d4dbf3bb046650c8df62bf0553d0b7ff..15078f0ca3ce0cec65fd205918abe62e2114a936 100644 (file)
--- 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 0136931405124b46409e321fe3c96a5b7fd4b6a2..5af44ca567243006726c03a28355d61ed1124c4e 100644 (file)
--- 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 618326994c3c808e043127e7535d5523ed5634f3..c2dd129a3d08b00cf01559de25a3d3b0b95ea378 100644 (file)
--- 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 88a7e00c7282b287a885869ed59a841d07e0761b..4a2b04966288739a88d1b855c44253efb1d7da67 100644 (file)
--- 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>