From a53f6916b8c14e631aabd7bb5221731a02b2c27c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 28 Feb 2018 11:38:26 +0100
Subject: [PATCH] Bump akka to 2.5.10

https://akka.io/blog/news/2018/02/23/akka-2.5.10-released

Change-Id: I10d598a96e4a08078e10551517cee7f3882fc49d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 8cd7db350256591e351ef994fce96ff75a140ee1)
---
 .../src/main/history/dependencies.xml                     | 8 ++++----
 .../src/main/history/dependencies.xml                     | 4 ++--
 .../odl-akka-system-2.5/src/main/history/dependencies.xml | 6 +++---
 odlparent-lite/pom.xml                                    | 2 +-
 odlparent/pom.xml                                         | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/features/odl-akka-clustering-2.5/src/main/history/dependencies.xml b/features/odl-akka-clustering-2.5/src/main/history/dependencies.xml
index 6af8b16bd..af57f6412 100644
--- a/features/odl-akka-clustering-2.5/src/main/history/dependencies.xml
+++ b/features/odl-akka-clustering-2.5/src/main/history/dependencies.xml
@@ -2,10 +2,10 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-akka-clustering-2.5">
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">odl-akka-system-2.5</feature>
-        <bundle>mvn:com.typesafe.akka/akka-cluster_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-remote_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-stream_2.12/2.5.9</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-cluster_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-remote_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-stream_2.12/2.5.10</bundle>
         <bundle>mvn:com.typesafe/ssl-config-core_2.12/0.2.2</bundle>
         <bundle>mvn:io.aeron/aeron-client/1.7.0</bundle>
         <bundle>mvn:io.aeron/aeron-driver/1.7.0</bundle>
diff --git a/features/odl-akka-persistence-2.5/src/main/history/dependencies.xml b/features/odl-akka-persistence-2.5/src/main/history/dependencies.xml
index 2d22c6ff2..8d9ba5363 100644
--- a/features/odl-akka-persistence-2.5/src/main/history/dependencies.xml
+++ b/features/odl-akka-persistence-2.5/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.5</feature>
-        <bundle>mvn:com.typesafe.akka/akka-persistence_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.9</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-persistence_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.10</bundle>
     </feature>
 </features>
diff --git a/features/odl-akka-system-2.5/src/main/history/dependencies.xml b/features/odl-akka-system-2.5/src/main/history/dependencies.xml
index 49c3d7645..488de12b7 100644
--- a/features/odl-akka-system-2.5/src/main/history/dependencies.xml
+++ b/features/odl-akka-system-2.5/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.5">
     <feature version="0.0.0">
         <feature prerequisite="false" dependency="false">odl-akka-scala-2.12</feature>
-        <bundle>mvn:com.typesafe.akka/akka-actor_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-osgi_2.12/2.5.9</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-slf4j_2.12/2.5.9</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-actor_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-osgi_2.12/2.5.10</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-slf4j_2.12/2.5.10</bundle>
         <bundle>mvn:com.typesafe/config/1.3.2</bundle>
     </feature>
 </features>
diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index b26afa0cf..087ecb6a4 100644
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -490,7 +490,7 @@
                 <link>https://www.slf4j.org/apidocs/</link>
                 <link>https://xerces.apache.org/xerces2-j/javadocs/api/</link>
                 <link>https://google.github.io/guava/releases/23.6-jre/api/docs/</link>
-                <link>http://doc.akka.io/japi/akka/2.5.9/</link>
+                <link>http://doc.akka.io/japi/akka/2.5.10/</link>
                 <link>http://netty.io/4.1/api/</link>
                 <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>
                 <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.6/</link>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 73175328e..de54080cd 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -103,7 +103,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.5.9</akka.version>
+    <akka.version>2.5.10</akka.version>
     <leveldb.version>0.7</leveldb.version>
 
     <!-- Default Sonar configuration -->
-- 
2.36.6