BUG-7183: Bump akka to 2.4.16

This is the first build available for scala 2.12
with working OSGi and therefore is a prerequisite
for upgrade.

Change-Id: I73d7b3322fe72fe6814f81ed52006dc7866e4848
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/features-akka/src/main/feature/feature.xml b/features/features-akka/src/main/feature/feature.xml
index d4fc43d28b41bfea366c7e417a893b8caf317f86..27957f36d78ad684db7b1929d408c7244e13d62b 100644 (file)
--- a/features/features-akka/src/main/feature/feature.xml
+++ b/features/features-akka/src/main/feature/feature.xml
@@ -50,6 +50,7 @@
         <bundle>mvn:io.aeron/aeron-driver/1.0.4</bundle>
         <bundle>mvn:io.netty/netty/3.10.6.Final</bundle>
         <bundle>mvn:org.reactivestreams/reactive-streams/1.0.0</bundle>
+        <bundle>wrap:mvn:org.lmdbjava/lmdbjava/0.0.4</bundle>
     </feature>
     <feature name='odl-akka-leveldb' description='LevelDB' version='${leveldb.version}'>
         <bundle>wrap:mvn:org.iq80.leveldb/leveldb/${leveldb.version}</bundle>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 9f7bd885ca266e7c9056a85762542e7540547fe0..cf82fb945f4845108b9a6e793bbc0d25f1be2ca4 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -117,7 +117,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.11</akka.version>
+    <akka.version>2.4.16</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>8</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>