From f16f04016dc58845ae1f06c7543228f7bd6fca2b Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Mon, 12 Aug 2019 16:44:48 +0200
Subject: [PATCH] fix Sodium bump runtime problems

- mdsal/mdsal-model-artifacts replaced by mdsal/mdsal-artifacts
- unforce org.opendaylight.mdsal.binding.model.ietf version
- clean pom properties accordingly

JIRA: TRNSPRTPCE-135

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ie7244f7b25447ff6e71f61ab84d705dd87692a50
---
 common/pom.xml                               | 6 +++---
 features/odl-transportpce-stubmodels/pom.xml | 1 -
 features/odl-transportpce/pom.xml            | 1 -
 ordmodels/common/pom.xml                     | 6 +++---
 ordmodels/device/pom.xml                     | 8 ++++----
 ordmodels/network/pom.xml                    | 7 +++----
 ordmodels/pom.xml                            | 8 ++++----
 ordmodels/service/pom.xml                    | 6 +++---
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 462bb238d..d7ff95f54 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -36,9 +36,9 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.13.2</version>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>4.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index 6b330339e..1006fa0d1 100644
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/pom.xml
@@ -23,7 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.13.2</mdsal.model.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 370328fae..bfb6b8656 100644
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -23,7 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.model.version>0.13.2</mdsal.model.version>
     <mdsal.version>1.10.0-SNAPSHOT</mdsal.version>
     <yangtools.version>3.0.4</yangtools.version>
     <netconf.version>1.7.0-SNAPSHOT</netconf.version>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 72ba57d05..ba9cd9e2e 100644
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.13.2</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>4.0.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 0e74824a4..5a268fde6 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -31,9 +31,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.13.2</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>4.0.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -56,7 +56,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.15.6</version>
+      <version>2013.07.04.16.3</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index c7a3b0dfb..b4853f4f5 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.13.2</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>4.0.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -55,7 +55,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc8345</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <!--dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index d76ee118d..f75b7a10f 100644
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -87,9 +87,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.13.2</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>4.0.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -112,7 +112,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-afn-safi</artifactId>
-      <version>2013.07.04.15.6</version>
+      <version>2013.07.04.16.3</version>
       <type>pom</type>
     </dependency>
     <dependency>
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index ae05a6a28..7fd3a66d3 100644
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -24,9 +24,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>0.13.2</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>4.0.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-- 
2.36.6