From 11e056f028d3626765f5212938edae42d981e000 Mon Sep 17 00:00:00 2001
From: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
Date: Tue, 2 Feb 2021 22:41:34 +0200
Subject: [PATCH] Adopt akka-2.6.x

Adopt following upstreams to enable akka-2.6.x:
- controller-3.0.6
- aaa-0.13.1

Change-Id: Ib0ab4cb2f631559714383d4a4bae0ad672bf4e42
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
---
 features/netconf-connector/odl-message-bus/pom.xml            | 2 +-
 features/netconf-connector/odl-netconf-connector/pom.xml      | 4 ++--
 features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml    | 2 +-
 features/netconf/odl-aaa-netconf-plugin/pom.xml               | 2 +-
 features/netconf/odl-netconf-client/pom.xml                   | 2 +-
 features/netconf/odl-netconf-impl/pom.xml                     | 2 +-
 features/netconf/odl-netconf-netty-util/pom.xml               | 2 +-
 features/restconf/odl-restconf-common/pom.xml                 | 4 ++--
 features/restconf/odl-restconf-nb-rfc8040/pom.xml             | 2 +-
 .../src/test/resources/application.conf                       | 4 ++--
 parent/pom.xml                                                | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml
index 21e1fc34fc..ce8705d873 100644
--- a/features/netconf-connector/odl-message-bus/pom.xml
+++ b/features/netconf-connector/odl-message-bus/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-exp-messagebus</artifactId>
-            <version>3.0.5</version>
+            <version>3.0.6</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml
index 653fe45591..e15a79e18b 100644
--- a/features/netconf-connector/odl-netconf-connector/pom.xml
+++ b/features/netconf-connector/odl-netconf-connector/pom.xml
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.5</version>
+                <version>3.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-encryption-service</artifactId>
-            <version>0.13.0</version>
+            <version>0.13.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
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 e5d4912359..c67c16cb56 100644
--- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-shiro</artifactId>
-            <version>0.13.0</version>
+            <version>0.13.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml
index 2d12d63f18..2a89d35837 100644
--- a/features/netconf/odl-aaa-netconf-plugin/pom.xml
+++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-shiro</artifactId>
-            <version>0.13.0</version>
+            <version>0.13.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml
index 3fb5fe7b0c..2e6cc13b3b 100644
--- a/features/netconf/odl-netconf-client/pom.xml
+++ b/features/netconf/odl-netconf-client/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-exp-netty-config</artifactId>
-            <version>3.0.5</version>
+            <version>3.0.6</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml
index bb7cd7e2ff..c5e0ae9ab1 100644
--- a/features/netconf/odl-netconf-impl/pom.xml
+++ b/features/netconf/odl-netconf-impl/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.5</version>
+                <version>3.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml
index c6474651d3..30ca6a6fe5 100644
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/netconf/odl-netconf-netty-util/pom.xml
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.aaa</groupId>
                 <artifactId>aaa-artifacts</artifactId>
-                <version>0.13.0</version>
+                <version>0.13.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index cc69fa2a8a..c9d0a1edcb 100644
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -42,14 +42,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.5</version>
+                <version>3.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.aaa</groupId>
                 <artifactId>aaa-artifacts</artifactId>
-                <version>0.13.0</version>
+                <version>0.13.1</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 009c85f10f..c9001889fa 100644
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.5</version>
+                <version>3.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/netconf/netconf-topology-singleton/src/test/resources/application.conf b/netconf/netconf-topology-singleton/src/test/resources/application.conf
index 86b5453e86..ceae6decd8 100644
--- a/netconf/netconf-topology-singleton/src/test/resources/application.conf
+++ b/netconf/netconf-topology-singleton/src/test/resources/application.conf
@@ -5,7 +5,7 @@ Slave {
       warn-about-java-serializer-usage = false
     }
     remote {
-      netty.tcp {
+      classic.netty.tcp {
         hostname = "127.0.0.1"
         port = 2550
       }
@@ -26,7 +26,7 @@ Master {
       warn-about-java-serializer-usage = false
     }
     remote {
-      netty.tcp {
+      classic.netty.tcp {
         hostname = "127.0.0.1"
         port = 2552
       }
diff --git a/parent/pom.xml b/parent/pom.xml
index 42fb0954a3..832ba23324 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -25,14 +25,14 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.13.0</version>
+        <version>0.13.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6