From ce26e975ed39a43d43703fc81c79b612bd0223b9 Mon Sep 17 00:00:00 2001
From: Sam Hague <shague86@gmail.com>
Date: Fri, 21 Dec 2018 17:05:50 -0500
Subject: [PATCH] Use serviceutils artifacts

Depends-on: I65406f709f45bea1a5a938932551abd99fb5ffe9
Change-Id: Iccc11bb58a6ca96ead452b0edfb44924ea0cd96f
Signed-off-by: Sam Hague <shague@redhat.com>
---
 aclservice/impl/pom.xml          |  1 -
 coe/impl/pom.xml                 |  1 -
 commons/binding-parent/pom.xml   |  8 ++++++++
 dhcpservice/impl/pom.xml         |  1 -
 elanmanager/impl/pom.xml         |  2 --
 features/odl-netvirt-api/pom.xml | 17 +++++++++++------
 fibmanager/impl/pom.xml          |  1 -
 natservice/impl/pom.xml          |  2 --
 neutronvpn/impl/pom.xml          |  1 -
 qosservice/impl/pom.xml          |  1 -
 vpnmanager/impl/pom.xml          |  1 -
 11 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml
index d031df91c7..83650dd212 100644
--- a/aclservice/impl/pom.xml
+++ b/aclservice/impl/pom.xml
@@ -66,7 +66,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>srm-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
diff --git a/coe/impl/pom.xml b/coe/impl/pom.xml
index 46885e7ab0..eb67cf09da 100644
--- a/coe/impl/pom.xml
+++ b/coe/impl/pom.xml
@@ -62,7 +62,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index be4c4908bb..aadd21ebec 100644
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -30,6 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <neutron.version>0.12.0-SNAPSHOT</neutron.version>
     <openflowplugin.version>0.8.0-SNAPSHOT</openflowplugin.version>
     <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
+    <serviceutils.version>0.3.0-SNAPSHOT</serviceutils.version>
   </properties>
 
   <dependencyManagement>
@@ -41,6 +42,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.serviceutils</groupId>
+        <artifactId>serviceutils-artifacts</artifactId>
+        <version>${serviceutils.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/dhcpservice/impl/pom.xml b/dhcpservice/impl/pom.xml
index 5c686100b4..e75b58e154 100644
--- a/dhcpservice/impl/pom.xml
+++ b/dhcpservice/impl/pom.xml
@@ -101,7 +101,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/elanmanager/impl/pom.xml b/elanmanager/impl/pom.xml
index 2f582c3e62..f53e5e67d6 100644
--- a/elanmanager/impl/pom.xml
+++ b/elanmanager/impl/pom.xml
@@ -43,7 +43,6 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
@@ -53,7 +52,6 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>srm-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
diff --git a/features/odl-netvirt-api/pom.xml b/features/odl-netvirt-api/pom.xml
index 1044f5dff2..aa3ddbf60f 100644
--- a/features/odl-netvirt-api/pom.xml
+++ b/features/odl-netvirt-api/pom.xml
@@ -25,19 +25,26 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
+                <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>3.0.2</version>
+                <version>1.9.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
+                <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.9.0-SNAPSHOT</version>
+                <version>3.0.2</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.serviceutils</groupId>
+                <artifactId>serviceutils-artifacts</artifactId>
+                <version>0.3.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -58,14 +65,12 @@
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>odl-serviceutils-srm</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>odl-serviceutils-tools</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/fibmanager/impl/pom.xml b/fibmanager/impl/pom.xml
index 9a8cc117b4..7fdab842a5 100644
--- a/fibmanager/impl/pom.xml
+++ b/fibmanager/impl/pom.xml
@@ -83,7 +83,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>upgrade</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/natservice/impl/pom.xml b/natservice/impl/pom.xml
index 9138d3a014..fdd075adb6 100644
--- a/natservice/impl/pom.xml
+++ b/natservice/impl/pom.xml
@@ -46,12 +46,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>upgrade</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
diff --git a/neutronvpn/impl/pom.xml b/neutronvpn/impl/pom.xml
index 733cca6e44..2ff6504c53 100644
--- a/neutronvpn/impl/pom.xml
+++ b/neutronvpn/impl/pom.xml
@@ -57,7 +57,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
diff --git a/qosservice/impl/pom.xml b/qosservice/impl/pom.xml
index 5418025cc7..5a65c882d1 100644
--- a/qosservice/impl/pom.xml
+++ b/qosservice/impl/pom.xml
@@ -50,7 +50,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>srm-api</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
diff --git a/vpnmanager/impl/pom.xml b/vpnmanager/impl/pom.xml
index 59a0dc9cfe..0ab6dc196f 100644
--- a/vpnmanager/impl/pom.xml
+++ b/vpnmanager/impl/pom.xml
@@ -104,7 +104,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>upgrade</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Testing dependencies -->
-- 
2.36.6