From 718a7273f688f09b325f11287fa580cd09938206 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 12 Dec 2019 08:06:56 +0100
Subject: [PATCH] Bump odlparent/yangtools/mdsal to 6.0.3/4.0.3/5.0.6

Pick up the latest upgrades and fixes.

Change-Id: I921247985e6581ab9511a6fb6bb104bcce1f4fd8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                      |  2 +-
 .../src/main/resources/checkstyle/java_rules.xml       | 10 ++++++----
 commons/parent/pom.xml                                 |  4 ++--
 features/features-lispflowmapping/pom.xml              |  2 +-
 features/odl-lispflowmapping-inmemorydb/pom.xml        |  2 +-
 .../odl-lispflowmapping-mappingservice-shell/pom.xml   |  2 +-
 features/odl-lispflowmapping-mappingservice/pom.xml    |  2 +-
 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        |  2 +-
 features/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, 27 insertions(+), 25 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9209e9a0a..777523af0 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/commons/build_tools/src/main/resources/checkstyle/java_rules.xml b/commons/build_tools/src/main/resources/checkstyle/java_rules.xml
index 60ac9a3a9..e9474bff5 100644
--- a/commons/build_tools/src/main/resources/checkstyle/java_rules.xml
+++ b/commons/build_tools/src/main/resources/checkstyle/java_rules.xml
@@ -21,11 +21,13 @@
         <property name="multiLines" value="2"/>
     </module>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
+
     <module name="TreeWalker">
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
         <module name="AvoidStarImport"/>
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 8fb64cdd5..9ffd59fff 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
@@ -50,7 +50,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>5.0.4</version>
+        <version>5.0.6</version>
         <type>pom</type>
        <scope>import</scope>
       </dependency>
diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml
index 66b3265b5..a5340b50a 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml
index eaac4089c..64d64c300 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml
index c93b5e2a2..2dd3a51bc 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml
index 6aa2e489b..f94acf419 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml
index d9053e6ac..1a9d5b6b5 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>6.0.1</version>
+    <version>6.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>5.0.4</version>
+        <version>5.0.6</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 2ff1c91b3..d61de411a 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/odl-lispflowmapping-neutron/pom.xml b/features/odl-lispflowmapping-neutron/pom.xml
index 48549d175..8469cd63f 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>6.0.1</version>
+    <version>6.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>5.0.4</version>
+        <version>5.0.6</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 814cdce5d..899fa89e1 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index dbcff3882..84304f171 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml
index 86bf291ef..12a75c77a 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>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 259460874..36084ee65 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>5.0.4</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 620e6b801..8f7a72bd2 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>5.0.4</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index f729bbfb8..902cc3148 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>5.0.4</version>
+    <version>5.0.6</version>
     <relativePath/>
   </parent>
 
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>mdsal-singleton-common-api</artifactId>
-      <version>5.0.4</version>
+      <version>5.0.6</version>
     </dependency>
 
     <!--Needed for testing-->
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 227329ea0..831bd2786 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.3</version>
     <relativePath/>
   </parent>
 
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>5.0.4</version>
+        <version>5.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6