From 5bc6ac5e3cea9166ed0c6ca16c7f801d5ca57638 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 11 Aug 2018 09:21:48 +0200
Subject: [PATCH] Remove references to mdsal-model-artifacts

This artifact is going away, remove references to it.

Change-Id: I381b0fc6aaff72bbdf9e0d0192a0ca26a3b74e56
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal/odl-controller-model-topology/pom.xml    |  6 +++---
 features/mdsal/odl-mdsal-broker-local/pom.xml      | 14 --------------
 .../mdsal/odl-mdsal-clustering-commons/pom.xml     | 12 ------------
 features/mdsal/odl-mdsal-model-inventory/pom.xml   |  6 +++---
 features/mdsal/odl-message-bus-collector/pom.xml   |  6 +++---
 opendaylight/md-sal/sal-binding-dom-it/pom.xml     |  7 -------
 6 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 82d081f0cb..0ad5115348 100644
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -25,9 +25,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.14.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.6.0-SNAPSHOT</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 5c5b3e4bd2..eba30997e1 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -29,13 +29,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odlparent-artifacts</artifactId>
-                <version>3.1.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
@@ -50,13 +43,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.14.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index e68ba382f4..d798bc22c6 100644
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -21,18 +21,6 @@
     <version>1.9.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odlparent-artifacts</artifactId>
-                <version>3.1.3</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index b1b5aa4a21..d7d1ca0203 100644
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -26,9 +26,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.14.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.6.0-SNAPSHOT</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 12f2f6c25e..65c9cf4eaf 100644
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -35,9 +35,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.14.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.6.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 01068ffa20..c835954cf1 100644
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -29,13 +29,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-- 
2.36.6