From de540594ef3eaa5847e6beca6c885a94e0035e5d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 16 Jan 2020 22:10:01 +0100
Subject: [PATCH] Bump to odlparent-6.0.4/yangtools-4.0.6/mdsal-5.0.9

Pick up latest fixes and upgrades.

Change-Id: Id639868a847ec16da35040cf2cd45ba83860d99b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                           | 2 +-
 .../netconf-connector/features-netconf-connector/pom.xml    | 2 +-
 features/netconf-connector/odl-message-bus/pom.xml          | 2 +-
 features/netconf-connector/odl-netconf-callhome-ssh/pom.xml | 2 +-
 .../odl-netconf-clustered-topology/pom.xml                  | 2 +-
 .../netconf-connector/odl-netconf-connector-all/pom.xml     | 2 +-
 features/netconf-connector/odl-netconf-connector/pom.xml    | 4 ++--
 features/netconf-connector/odl-netconf-console/pom.xml      | 2 +-
 features/netconf-connector/odl-netconf-topology/pom.xml     | 2 +-
 features/netconf-connector/pom.xml                          | 2 +-
 features/netconf/features-netconf/pom.xml                   | 2 +-
 features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml  | 2 +-
 features/netconf/odl-aaa-netconf-plugin/pom.xml             | 2 +-
 features/netconf/odl-netconf-all/pom.xml                    | 2 +-
 features/netconf/odl-netconf-api/pom.xml                    | 6 +++---
 features/netconf/odl-netconf-client/pom.xml                 | 2 +-
 features/netconf/odl-netconf-impl/pom.xml                   | 2 +-
 features/netconf/odl-netconf-mapping-api/pom.xml            | 2 +-
 features/netconf/odl-netconf-mdsal/pom.xml                  | 2 +-
 features/netconf/odl-netconf-netty-util/pom.xml             | 2 +-
 features/netconf/odl-netconf-notifications-api/pom.xml      | 2 +-
 features/netconf/odl-netconf-notifications-impl/pom.xml     | 4 ++--
 features/netconf/odl-netconf-ssh/pom.xml                    | 2 +-
 features/netconf/odl-netconf-tcp/pom.xml                    | 2 +-
 features/netconf/odl-netconf-util/pom.xml                   | 4 ++--
 features/netconf/pom.xml                                    | 2 +-
 features/pom.xml                                            | 2 +-
 features/restconf/features-restconf/pom.xml                 | 2 +-
 features/restconf/odl-mdsal-apidocs/pom.xml                 | 4 ++--
 features/restconf/odl-restconf-all/pom.xml                  | 2 +-
 features/restconf/odl-restconf-common/pom.xml               | 6 +++---
 features/restconf/odl-restconf-nb-bierman02/pom.xml         | 4 ++--
 features/restconf/odl-restconf-nb-rfc8040/pom.xml           | 2 +-
 features/restconf/odl-restconf/pom.xml                      | 2 +-
 features/restconf/pom.xml                                   | 2 +-
 features/yanglib/features-yanglib/pom.xml                   | 2 +-
 features/yanglib/odl-yanglib/pom.xml                        | 2 +-
 features/yanglib/pom.xml                                    | 2 +-
 karaf/pom.xml                                               | 2 +-
 netconf/models/pom.xml                                      | 2 +-
 netconf/netconf-config/pom.xml                              | 2 +-
 netconf/netconf-topology-config/pom.xml                     | 2 +-
 netconf/pom.xml                                             | 2 +-
 netconf/shaded-exificient-jar/pom.xml                       | 2 +-
 netconf/shaded-exificient/pom.xml                           | 2 +-
 netconf/tools/pom.xml                                       | 2 +-
 parent/pom.xml                                              | 2 +-
 pom.xml                                                     | 2 +-
 restconf/pom.xml                                            | 2 +-
 restconf/restconf-models/pom.xml                            | 2 +-
 restconf/sal-rest-connector-config/pom.xml                  | 2 +-
 restconf/websocket-client/pom.xml                           | 2 --
 52 files changed, 60 insertions(+), 62 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 0a58240d1b..25557064a7 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>6.0.3</version>
+      <version>6.0.4</version>
       <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml
index efc4c4b214..307108e9c7 100644
--- a/features/netconf-connector/features-netconf-connector/pom.xml
+++ b/features/netconf-connector/features-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml
index aeb6a67c50..9258c293d1 100644
--- a/features/netconf-connector/odl-message-bus/pom.xml
+++ b/features/netconf-connector/odl-message-bus/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
index 581c00fb02..00ee47c89d 100644
--- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
+++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
index 5cc36b27d1..3e1b430171 100644
--- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
+++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml
index 53203cb377..401b5a0964 100644
--- a/features/netconf-connector/odl-netconf-connector-all/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml
index 116313cdfe..b85a1b7e7e 100644
--- a/features/netconf-connector/odl-netconf-connector/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>5.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml
index 1e60cf9862..60021c7c45 100644
--- a/features/netconf-connector/odl-netconf-console/pom.xml
+++ b/features/netconf-connector/odl-netconf-console/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml
index 71276cb791..43eed48072 100644
--- a/features/netconf-connector/odl-netconf-topology/pom.xml
+++ b/features/netconf-connector/odl-netconf-topology/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 6c41cb5bfd..e4f1573b29 100644
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 6a63488f1e..e281b614b1 100644
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
index 14a935e600..02a3ac08ff 100644
--- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml
index fdaffa9dfa..2eb6c97aa3 100644
--- a/features/netconf/odl-aaa-netconf-plugin/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml
index 5081b5a703..cb2c025585 100644
--- a/features/netconf/odl-netconf-all/pom.xml
+++ b/features/netconf/odl-netconf-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 068a5a6750..52f68fc2f0 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,14 +28,14 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>4.0.3</version>
+                <version>4.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>5.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml
index 1f5fca4f9d..fe3976972b 100644
--- a/features/netconf/odl-netconf-client/pom.xml
+++ b/features/netconf/odl-netconf-client/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml
index 6ee6d1f07b..09ebb1d377 100644
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/netconf/odl-netconf-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml
index 25c2985504..356f638087 100644
--- a/features/netconf/odl-netconf-mapping-api/pom.xml
+++ b/features/netconf/odl-netconf-mapping-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml
index 5026554cdb..faa637217e 100644
--- a/features/netconf/odl-netconf-mdsal/pom.xml
+++ b/features/netconf/odl-netconf-mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml
index 6103a4d2fd..96f06b84d4 100644
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/netconf/odl-netconf-netty-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml
index cfeb745a98..dfd75aa6d4 100644
--- a/features/netconf/odl-netconf-notifications-api/pom.xml
+++ b/features/netconf/odl-netconf-notifications-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml
index 311970bcb6..87dd634dc1 100644
--- a/features/netconf/odl-netconf-notifications-impl/pom.xml
+++ b/features/netconf/odl-netconf-notifications-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>5.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index d7eb436199..13eea37f32 100644
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/netconf/odl-netconf-ssh/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml
index 8bd38f5988..5870959ac2 100644
--- a/features/netconf/odl-netconf-tcp/pom.xml
+++ b/features/netconf/odl-netconf-tcp/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml
index f5a8353f83..2ca6dad950 100644
--- a/features/netconf/odl-netconf-util/pom.xml
+++ b/features/netconf/odl-netconf-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-codec</artifactId>
-            <version>4.0.3</version>
+            <version>4.0.6</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 041cc473d0..edec290cdf 100644
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 3b10e81698..be99533ce1 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml
index 091b000396..811e520fb0 100644
--- a/features/restconf/features-restconf/pom.xml
+++ b/features/restconf/features-restconf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml
index f8b8d2c10e..744f55d0fa 100644
--- a/features/restconf/odl-mdsal-apidocs/pom.xml
+++ b/features/restconf/odl-mdsal-apidocs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-jackson-2.9</artifactId>
-            <version>6.0.3</version>
+            <version>6.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml
index 1b17a79773..c18a29e8c8 100644
--- a/features/restconf/odl-restconf-all/pom.xml
+++ b/features/restconf/odl-restconf-all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index cd2558b357..12b9af8c28 100644
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,14 +28,14 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>4.0.3</version>
+                <version>4.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>5.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml
index 65ca5cf7f6..baf321853b 100644
--- a/features/restconf/odl-restconf-nb-bierman02/pom.xml
+++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>5.0.9</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index 0e84a3aaa2..c98af40c19 100644
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml
index bfe79828b8..8463db3e85 100644
--- a/features/restconf/odl-restconf/pom.xml
+++ b/features/restconf/odl-restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index 06ce880aa7..da1fe5ec26 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml
index 39237e5bc5..1b7eeaad0b 100644
--- a/features/yanglib/features-yanglib/pom.xml
+++ b/features/yanglib/features-yanglib/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml
index a2ecc141ff..a73765afd7 100644
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/yanglib/odl-yanglib/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 49ecda7c4d..c643bec550 100644
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/karaf/pom.xml b/karaf/pom.xml
index bbcd0be725..c84ccd5ba8 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index bf63644ff3..ccbbf8e385 100644
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index 40d1a0994d..a5a995fa44 100644
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml
index ccbc567050..9dff0ce732 100644
--- a/netconf/netconf-topology-config/pom.xml
+++ b/netconf/netconf-topology-config/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/pom.xml b/netconf/pom.xml
index ad2b2836bf..86a5dd4905 100644
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml
index 05584c7743..7bdd279159 100644
--- a/netconf/shaded-exificient-jar/pom.xml
+++ b/netconf/shaded-exificient-jar/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml
index 7810b0ebb8..3499b755a9 100644
--- a/netconf/shaded-exificient/pom.xml
+++ b/netconf/shaded-exificient/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index 5fd5234152..6d06d86b90 100644
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index fc673ab253..8dbeb3bcb5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.6</version>
+    <version>5.0.9</version>
     <relativePath/>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 3f531162d7..ddda895a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/pom.xml b/restconf/pom.xml
index cf7deabe78..877a39b887 100644
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml
index 4ca04968fd..7f8522c942 100644
--- a/restconf/restconf-models/pom.xml
+++ b/restconf/restconf-models/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index a9cba6d253..34d7ff67a1 100644
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.3</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/restconf/websocket-client/pom.xml b/restconf/websocket-client/pom.xml
index abfe4940c4..1103647989 100644
--- a/restconf/websocket-client/pom.xml
+++ b/restconf/websocket-client/pom.xml
@@ -26,8 +26,6 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-client</artifactId>
-            <!-- FIXME: remove this with odlparent-6.0.3+ -->
-            <version>9.4.12.v20180830</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.argparse4j</groupId>
-- 
2.36.6