From 5fa8015b3a2a73840b6e75fe9d97b094e3b6b77a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 6 Mar 2020 16:02:37 +0100
Subject: [PATCH] Bump to odlparent-5.0.6/yangtools-3.0.10

This picks up latest fixes from both upstreams.

Change-Id: I7e374903ca22059f5e31377a9b91971a2d82e196
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                          | 2 +-
 binding/maven-sal-api-gen-plugin/pom.xml                   | 2 +-
 .../mdsal/binding/dom/adapter/test/AssertCollections.java  | 7 -------
 binding/mdsal-binding-test-utils/pom.xml                   | 2 +-
 binding/pom.xml                                            | 2 +-
 .../yangtools/yang/binding/annotations/RoutingContext.java | 2 --
 common/pom.xml                                             | 2 +-
 dom/dom-parent/pom.xml                                     | 2 +-
 dom/pom.xml                                                | 2 +-
 entityownership/pom.xml                                    | 2 +-
 features/feature-parent/pom.xml                            | 2 +-
 features/features-mdsal-experimental/pom.xml               | 2 +-
 features/features-mdsal/pom.xml                            | 2 +-
 features/pom.xml                                           | 2 +-
 model/iana/pom.xml                                         | 2 +-
 model/ietf/pom.xml                                         | 2 +-
 model/pom.xml                                              | 2 +-
 pom.xml                                                    | 2 +-
 singleton-service/pom.xml                                  | 2 +-
 trace/pom.xml                                              | 2 +-
 yanglib/pom.xml                                            | 2 +-
 21 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 2e432e267d..4014f70f97 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>5.0.5</version>
+      <version>5.0.6</version>
       <relativePath/>
     </parent>
 
diff --git a/binding/maven-sal-api-gen-plugin/pom.xml b/binding/maven-sal-api-gen-plugin/pom.xml
index 0e14d1792c..b44aaa0a55 100644
--- a/binding/maven-sal-api-gen-plugin/pom.xml
+++ b/binding/maven-sal-api-gen-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java
index c85622dcb0..a7eb9c31cc 100644
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java
@@ -5,16 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.binding.dom.adapter.test;
 
 import java.util.Collection;
 import java.util.Map;
-
 import org.junit.Assert;
 
 public final class AssertCollections {
-
     private AssertCollections() {
     }
 
@@ -30,7 +27,6 @@ public final class AssertCollections {
         for (Object key : values) {
             Assert.assertTrue(set.contains(key));
         }
-
     }
 
     public static void assertContains(final Map<?,?> map, final Object... values) {
@@ -50,7 +46,4 @@ public final class AssertCollections {
             Assert.assertFalse(map.containsKey(key));
         }
     }
-
-
-
 }
diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index 480af7e0d4..dce5fdfc0e 100644
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/binding/pom.xml b/binding/pom.xml
index ca3c3c84bc..a07de499bf 100644
--- a/binding/pom.xml
+++ b/binding/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/RoutingContext.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/RoutingContext.java
index 169d9ef825..1ea4537557 100644
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/RoutingContext.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/annotations/RoutingContext.java
@@ -13,10 +13,8 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.opendaylight.yangtools.yang.binding.BaseIdentity;
 
-
 @Inherited
 @Documented
 @Target(ElementType.METHOD)
diff --git a/common/pom.xml b/common/pom.xml
index 8db7fb3cbd..c4b8e4c5f9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml
index f494e41731..bc8dc5e54f 100644
--- a/dom/dom-parent/pom.xml
+++ b/dom/dom-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/dom/pom.xml b/dom/pom.xml
index d6ae1daf1e..7443a7359b 100644
--- a/dom/pom.xml
+++ b/dom/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/entityownership/pom.xml b/entityownership/pom.xml
index cd96370cb2..62f551fbb3 100644
--- a/entityownership/pom.xml
+++ b/entityownership/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml
index 096041e4d4..f38ff8e3dc 100644
--- a/features/feature-parent/pom.xml
+++ b/features/feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml
index 894023adfe..c05d794a76 100644
--- a/features/features-mdsal-experimental/pom.xml
+++ b/features/features-mdsal-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 0a80e47500..41c45ce960 100644
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 5a74f6a2c7..f87a005c79 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index a38d0aed8a..d9fa243963 100644
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index ff225f921d..16e6f581c1 100644
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/model/pom.xml b/model/pom.xml
index 860269d27a..bf65008094 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 5c1723c5a8..cb91cb7b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml
index a5e88c9145..10e3c44141 100644
--- a/singleton-service/pom.xml
+++ b/singleton-service/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/trace/pom.xml b/trace/pom.xml
index 4b341e6626..51b7b6514a 100644
--- a/trace/pom.xml
+++ b/trace/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
diff --git a/yanglib/pom.xml b/yanglib/pom.xml
index 51694a8086..9abaf5a99a 100644
--- a/yanglib/pom.xml
+++ b/yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>5.0.5</version>
+        <version>5.0.6</version>
         <relativePath/>
     </parent>
 
-- 
2.36.6