From b18378817210aa4ec906676288b7551cb431aae9 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Wed, 20 Feb 2019 11:23:06 +0100
Subject: [PATCH] fix mdsal binding models

downgrade mdsal binding models to 1.2.6 (non SNAPSHOT) and others ietf
or iana models to 0.13.6 and 1.0.6 so that they are aligned with mdsal
binding parent version 3.0.6 (neon SR0 target)

Change-Id: I5012741cbf1dd714474af7209199008c37b3649a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
---
 features/odl-transportpce-api/pom.xml        |  2 +-
 features/odl-transportpce-ordmodels/pom.xml  |  2 +-
 features/odl-transportpce-stubmodels/pom.xml |  4 ++--
 ordmodels/common/pom.xml                     |  2 +-
 ordmodels/device/pom.xml                     |  4 ++--
 ordmodels/network/pom.xml                    |  4 ++--
 ordmodels/pom.xml                            | 12 ++++++------
 ordmodels/service/pom.xml                    |  4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 15c653b55..6a6e671d9 100644
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.bmodel.version>1.2.7-SNAPSHOT</mdsal.bmodel.version>
+    <mdsal.bmodel.version>1.2.6</mdsal.bmodel.version>
     <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <yangtools.version>2.1.8</yangtools.version>
diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index f16700857..e1c94923d 100644
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.bmodel.version>1.2.7-SNAPSHOT</mdsal.bmodel.version>
+    <mdsal.bmodel.version>1.2.6</mdsal.bmodel.version>
     <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <yangtools.version>2.1.8</yangtools.version>
diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index 0152d7155..d95b2fd75 100644
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/pom.xml
@@ -34,12 +34,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 29e0ae087..9a37b49c4 100644
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -37,7 +37,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 2231160c1..0191d2a0d 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -61,12 +61,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index d2c6d2259..5f6a56dfc 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -45,12 +45,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <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 5f09244c7..fbe9cc62c 100644
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -104,12 +104,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -120,7 +120,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-access-control-list</artifactId>
-      <version>0.13.7-SNAPSHOT</version>
+      <version>0.13.6</version>
     </dependency>
     <!--dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -135,17 +135,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
       <artifactId>iana-if-type</artifactId>
-      <version>1.0.7-SNAPSHOT</version>
+      <version>1.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc7223</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-packet-fields</artifactId>
-      <version>0.13.7-SNAPSHOT</version>
+      <version>0.13.6</version>
     </dependency>
   </dependencies>
 
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index e0e99a6c0..626851697 100644
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -45,12 +45,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.7-SNAPSHOT</version>
+      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
-- 
2.36.6