From 08cadd075dd3de973d26f9cc1b5c51d6b5b38898 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 25 Mar 2020 22:48:04 +0100
Subject: [PATCH] Use Magnesium controller

As part of controller transition to being MRI, downgrade the version
used to Magnesium release. This will be bumped to Aluminium proper
during the MRI window.

Change-Id: I592a291a25924621e85a83c66b168ec9dfbdd307
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 commons/binding-parent/pom.xml                              | 2 +-
 commons/it/pom.xml                                          | 2 +-
 .../odl-ovsdb-hwvtepsouthbound/pom.xml                      | 2 +-
 hwvtepsouthbound/hwvtepsouthbound-it/pom.xml                | 5 +----
 .../southbound-features/odl-ovsdb-southbound-impl/pom.xml   | 2 +-
 southbound/southbound-it/pom.xml                            | 6 +-----
 utils/odl-ovsdb-utils/pom.xml                               | 2 +-
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 85dd32d69..db7aac14f 100644
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>1.11.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/commons/it/pom.xml b/commons/it/pom.xml
index 6ae224a20..5de0cffd8 100644
--- a/commons/it/pom.xml
+++ b/commons/it/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.11.0</version>
     <relativePath/>
   </parent>
 
diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index 13d3cec18..fe158656b 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
+            <version>1.11.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
index 2b5d379a1..cfa09946a 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
@@ -23,9 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <!-- <name> formatting is used by autorelease to parse and notify projects on
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
-  <properties>
-    <controller.mdsal.version>1.12.0-SNAPSHOT</controller.mdsal.version>
-  </properties>
 
   <dependencyManagement>
     <dependencies>
@@ -39,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
+        <version>1.11.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
index ebf6b0cd1..3cf5cce96 100644
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
@@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
+            <version>1.11.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml
index 5d2e9fc64..8d6931bd7 100644
--- a/southbound/southbound-it/pom.xml
+++ b/southbound/southbound-it/pom.xml
@@ -24,10 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        build failure. Please do not modify this unless you have a good reason. -->
   <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
-  <properties>
-    <controller.mdsal.version>1.12.0-SNAPSHOT</controller.mdsal.version>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -40,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
+        <version>1.11.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml
index 4941683b4..f0a3d57f3 100644
--- a/utils/odl-ovsdb-utils/pom.xml
+++ b/utils/odl-ovsdb-utils/pom.xml
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
+                <version>1.11.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-- 
2.36.6