From b1391ca30d8f7b580930329610c52f15bce36a2c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 27 Mar 2020 09:47:45 +0100
Subject: [PATCH] Fix serviceutils dependency

Use serviceutils-artifacts to get the right set of artifacts,
and bump it to 0.6.0-SNAPSHOT, as that is what Aluminium is using.

While we are at it, also centralize infrautils definitions.

Change-Id: I38c1ad81bffc23b521c2c07f36e0d76f0f6665a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 commons/binding-parent/pom.xml                 | 14 ++++++++++++++
 hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml |  1 -
 southbound/southbound-impl/pom.xml             |  3 ---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 81861af5c..85dd32d69 100644
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -29,6 +29,20 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.infrautils</groupId>
+        <artifactId>infrautils-artifacts</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.serviceutils</groupId>
+        <artifactId>serviceutils-artifacts</artifactId>
+        <version>0.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 8edeeab8e..dc795bc7e 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -86,7 +86,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>upgrade</artifactId>
-      <version>0.5.0-SNAPSHOT</version>
     </dependency>
     <!-- Testing Dependencies -->
     <dependency>
diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index efdb43d91..9c872a5f7 100644
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -78,18 +78,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>ready-api</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
       <artifactId>upgrade</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
     </dependency>
     <!-- external dependencies -->
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>diagstatus-api</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
-- 
2.36.6