From 6972dee687a4be9d046903d16c943c043cc3d07a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Jan 2018 12:22:31 +0100
Subject: [PATCH] Bump akka to 2.4.20

https://akka.io/blog/news/2017/06/12/akka-2.4.19-released
https://akka.io/blog/news/2017/08/10/akka-2.4.20-released

Change-Id: I814c2997a44d75eb9abe9c816e21c2baa7211aeb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../src/main/history/dependencies.xml                     | 8 ++++----
 .../src/main/history/dependencies.xml                     | 4 ++--
 .../odl-akka-system-2.4/src/main/history/dependencies.xml | 6 +++---
 odlparent/pom.xml                                         | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/features/odl-akka-clustering-2.4/src/main/history/dependencies.xml b/features/odl-akka-clustering-2.4/src/main/history/dependencies.xml
index 0045005b8..e290c336a 100644
--- a/features/odl-akka-clustering-2.4/src/main/history/dependencies.xml
+++ b/features/odl-akka-clustering-2.4/src/main/history/dependencies.xml
@@ -3,10 +3,10 @@
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">odl-akka-system-2.4</feature>
         <feature prerequisite="false" dependency="false">wrap</feature>
-        <bundle>mvn:com.typesafe.akka/akka-cluster_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-remote_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-stream_2.11/2.4.18</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-cluster_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-remote_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-stream_2.11/2.4.20</bundle>
         <bundle>mvn:com.typesafe/ssl-config-core_2.11/0.2.1</bundle>
         <bundle>mvn:io.aeron/aeron-client/1.2.5</bundle>
         <bundle>mvn:io.aeron/aeron-driver/1.2.5</bundle>
diff --git a/features/odl-akka-persistence-2.4/src/main/history/dependencies.xml b/features/odl-akka-persistence-2.4/src/main/history/dependencies.xml
index 3ccc9d241..40f7d3a0f 100644
--- a/features/odl-akka-persistence-2.4/src/main/history/dependencies.xml
+++ b/features/odl-akka-persistence-2.4/src/main/history/dependencies.xml
@@ -3,7 +3,7 @@
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">odl-akka-leveldb-0.7</feature>
         <feature prerequisite="false" dependency="false">odl-akka-system-2.4</feature>
-        <bundle>mvn:com.typesafe.akka/akka-persistence_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.11/2.4.18</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-persistence_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.11/2.4.20</bundle>
     </feature>
 </features>
diff --git a/features/odl-akka-system-2.4/src/main/history/dependencies.xml b/features/odl-akka-system-2.4/src/main/history/dependencies.xml
index ef57090dc..6e61afaa1 100644
--- a/features/odl-akka-system-2.4/src/main/history/dependencies.xml
+++ b/features/odl-akka-system-2.4/src/main/history/dependencies.xml
@@ -2,9 +2,9 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-system-2.4">
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">odl-akka-scala-2.11</feature>
-        <bundle>mvn:com.typesafe.akka/akka-actor_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-osgi_2.11/2.4.18</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-slf4j_2.11/2.4.18</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-actor_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-osgi_2.11/2.4.20</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-slf4j_2.11/2.4.20</bundle>
         <bundle>mvn:com.typesafe/config/1.3.0</bundle>
     </feature>
 </features>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 21965a132..5f12309bd 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -104,7 +104,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.18</akka.version>
+    <akka.version>2.4.20</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>12</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
-- 
2.36.6