From 30bd1819dc7d8dd42ff586777498171347be7584 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 11 Jun 2020 23:55:48 +0200
Subject: [PATCH] Integrate controller-2.0.2

This bumps versions to the following:
- odlparent-7.0.3
- yangtools-5.0.3
- mdsal-6.0.2
- controller-2.0.2

Change-Id: Idc9a72c8781582fd87ff8035a0f58e5a28c59e96
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                         | 2 +-
 commons/parent/pom.xml                                    | 6 +++---
 features/features-lispflowmapping/pom.xml                 | 2 +-
 features/odl-lispflowmapping-inmemorydb/pom.xml           | 4 ++--
 features/odl-lispflowmapping-mappingservice-shell/pom.xml | 2 +-
 features/odl-lispflowmapping-mappingservice/pom.xml       | 4 ++--
 features/odl-lispflowmapping-models/pom.xml               | 4 ++--
 features/odl-lispflowmapping-msmr/pom.xml                 | 2 +-
 features/odl-lispflowmapping-neutron/pom.xml              | 4 ++--
 features/odl-lispflowmapping-southbound/pom.xml           | 4 ++--
 features/pom.xml                                          | 2 +-
 integrationtest/pom.xml                                   | 2 +-
 lispflowmapping-karaf/pom.xml                             | 2 +-
 mappingservice/api/pom.xml                                | 2 +-
 mappingservice/lisp-proto/pom.xml                         | 2 +-
 mappingservice/neutron/pom.xml                            | 4 ++--
 mappingservice/pom.xml                                    | 4 ++--
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index a8d4e5d72..a67b13e6c 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index ad16ea885..170c62b69 100644
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,7 +15,7 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
@@ -70,7 +70,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 20202423e..dcc98449a 100644
--- a/features/features-lispflowmapping/pom.xml
+++ b/features/features-lispflowmapping/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 2a049949b..149619594 100644
--- a/features/odl-lispflowmapping-inmemorydb/pom.xml
+++ b/features/odl-lispflowmapping-inmemorydb/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,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>2.0.1</version>
+      <version>2.0.2</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index 61b86f51f..de0f1a5ac 100644
--- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 948f972bf..531e03ed6 100644
--- a/features/odl-lispflowmapping-mappingservice/pom.xml
+++ b/features/odl-lispflowmapping-mappingservice/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -35,7 +35,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>2.0.1</version>
+      <version>2.0.2</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index adaf614cf..f1a0144d7 100644
--- a/features/odl-lispflowmapping-models/pom.xml
+++ b/features/odl-lispflowmapping-models/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index fbdf7ed5a..ad5839a45 100644
--- a/features/odl-lispflowmapping-msmr/pom.xml
+++ b/features/odl-lispflowmapping-msmr/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index c2f3cc4b7..fa608f060 100644
--- a/features/odl-lispflowmapping-neutron/pom.xml
+++ b/features/odl-lispflowmapping-neutron/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml
index 0e607faa0..79a4ade82 100644
--- a/features/odl-lispflowmapping-southbound/pom.xml
+++ b/features/odl-lispflowmapping-southbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -35,7 +35,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>2.0.1</version>
+      <version>2.0.2</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 118d410ca..485dc24e9 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 02cf41d9b..1709f6866 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -11,7 +11,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>2.0.1</version>
+    <version>2.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index f098ccee1..6b29d5751 100644
--- a/lispflowmapping-karaf/pom.xml
+++ b/lispflowmapping-karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 88c778eab..0d0fe6668 100644
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index ecd80ba6d..1cdf8485b 100644
--- a/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 409e5a718..21730a374 100644
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <relativePath/>
   </parent>
 
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-singleton-common-api</artifactId>
-      <version>6.0.1</version>
+      <version>6.0.2</version>
     </dependency>
 
     <!--Needed for testing-->
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index c93472ac4..e253cf92e 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>7.0.2</version>
+    <version>7.0.3</version>
     <relativePath/>
   </parent>
 
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6