From 123d08efedbef2048a297797ce780e8b6f489bac Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Wed, 30 Jan 2019 18:39:00 -0800
Subject: [PATCH] Update MRI versions in distribution

The idea is to use this in the Multipatch job.

Change-Id: I17534b01ed19687cd75a8fad8a99c5a09604cc2d
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/feature-repos/pom.xml   | 4 ++--
 artifacts/upstream/properties/pom.xml      | 6 ++++--
 artifacts/upstream/single-features/pom.xml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 2cca931b..d292ea36 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -76,7 +76,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>features-mdsal</artifactId>
-                        <version>${mdsal.version}</version>
+                        <version>${controller.version}</version>
                         <classifier>features</classifier>
                         <type>xml</type>
                     </dependency>
@@ -90,7 +90,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>features-mdsal-trace</artifactId>
-                        <version>${mdsal.version}</version>
+                        <version>${controller.version}</version>
                         <classifier>features</classifier>
                         <type>xml</type>
                     </dependency>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 2f49738a..8483e545 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -48,12 +48,13 @@
         <bgpcep.version>0.11.0-SNAPSHOT</bgpcep.version>
         <coe.version>0.5.0-SNAPSHOT</coe.version>
         <config.version>0.10.0-SNAPSHOT</config.version>
-        <controller.extras.version>1.12.0-SNAPSHOT</controller.extras.version>
+        <controller.version>1.9.0-SNAPSHOT</controller.version>
+	<controller.extras.version>1.12.0-SNAPSHOT</controller.extras.version>
         <daexim.version>1.5.0-SNAPSHOT</daexim.version>
         <genius.version>0.6.0-SNAPSHOT</genius.version>
         <infrautils.version>1.5.0-SNAPSHOT</infrautils.version>
         <lispflowmapping.version>1.9.0-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>3.0.6</mdsal.version>
         <netconf.version>1.6.0-SNAPSHOT</netconf.version>
         <netvirt.version>0.8.0-SNAPSHOT</netvirt.version>
         <neutron.version>0.12.0-SNAPSHOT</neutron.version>
@@ -63,6 +64,7 @@
         <restconf.version>1.9.0-SNAPSHOT</restconf.version>
         <serviceutils.version>0.3.0-SNAPSHOT</serviceutils.version>
         <sfc.version>0.9.0-SNAPSHOT</sfc.version>
+        <yangtools.version>2.1.8</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index ce4d3e32..c9b55b38 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -76,7 +76,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>odl-mdsal-broker</artifactId>
-                        <version>${mdsal.version}</version>
+                        <version>${controller.version}</version>
                         <classifier>features</classifier>
                         <type>xml</type>
                     </dependency>
-- 
2.36.6