From 82e4f2305382caf5936409404815a7069ac553cf Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 21 Jan 2021 19:19:47 +0100
Subject: [PATCH] Bump upstream versions

Adopt following upstreams:
- odlparent-8.1.0
- infrautils-1.9.5
- yangtools-6.0.4
- mdsal-7.0.5
- controller-3.0.5

Change-Id: I47aace27a8ec5736f34e9d974a1168ef9e8a94be
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                         | 2 +-
 commons/parent/pom.xml                                    | 8 ++++----
 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       | 2 +-
 features/odl-lispflowmapping-models/pom.xml               | 4 ++--
 .../src/main/feature/feature.xml                          | 2 +-
 features/odl-lispflowmapping-msmr/pom.xml                 | 2 +-
 features/odl-lispflowmapping-neutron/pom.xml              | 4 ++--
 features/odl-lispflowmapping-southbound/pom.xml           | 4 ++--
 .../src/main/feature/feature.xml                          | 2 +-
 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                            | 2 +-
 mappingservice/pom.xml                                    | 4 ++--
 19 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 6c4b1ce93..ee45b67f4 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 92c013c65..c508772f0 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
   <name>ODL :: lispflowmapping :: ${project.artifactId}</name>
 
   <properties>
-    <branding.version>3.0.4</branding.version>
+    <branding.version>3.0.5</branding.version>
     <build.suffix>1.0.0</build.suffix>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
     <lispflowmapping.version>1.13.0-SNAPSHOT</lispflowmapping.version>
@@ -48,7 +48,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>7.0.5</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
@@ -70,7 +70,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.4</version>
+        <version>3.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index e19528b17..e1d754915 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index 29f5cbee9..9f958b57f 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>8.0.3</version>
+    <version>8.1.0</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>3.0.4</version>
+      <version>3.0.5</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 0387544f4..dd6e0b5cc 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 881eac6c6..616579d3c 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index c221cb446..5c14d37db 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>8.0.3</version>
+    <version>8.1.0</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>7.0.4</version>
+        <version>7.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
index d26cede31..7447ae9bc 100644
--- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-models">
     <feature name="odl-lispflowmapping-models">
-        <feature version="[8,9)">odl-apache-commons-lang3</feature>
+        <feature version="[8.1,9)">odl-apache-commons-lang3</feature>
         <feature version="[7,8)">odl-mdsal-model-rfc6991</feature>
     </feature>
 </features>
diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml
index c780a4fbe..9fa457d8e 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index aaeb38bbb..108867f99 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>8.0.3</version>
+    <version>8.1.0</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>7.0.4</version>
+        <version>7.0.5</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 c465d336f..877c51ca3 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>8.0.3</version>
+    <version>8.1.0</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>3.0.4</version>
+      <version>3.0.5</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
index b1eecc69f..799b2544f 100644
--- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
+++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-lispflowmapping-southbound">
     <feature name="odl-lispflowmapping-southbound">
-        <feature version="[8,9)">odl-netty-4</feature>
+        <feature version="[8.1,9)">odl-netty-4</feature>
         <feature version="[3,4)">odl-mdsal-broker</feature>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 63192e2ac..fa608282b 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index e170e0211..82c1e31fc 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>3.0.4</version>
+    <version>3.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index 6bb97461e..7725d7197 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>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 8660fb24e..4e7e0700b 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>7.0.4</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 808864eac..6bad48586 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>7.0.4</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 7b20746f7..7b28c483c 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>7.0.4</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index fe0fda26d..b0205619d 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>8.0.3</version>
+    <version>8.1.0</version>
     <relativePath/>
   </parent>
 
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>7.0.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6