Bump akka to 2.4.11

http://akka.io/news/2016/09/30/akka-2.4.11-released.html, brings
options to use alternative remoting transport, potentially increasing
performance and stability.

Change-Id: Ib26f8557ccca278c1057b91bbe3bd4236ed4e46b
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 47f823ce9c768535ac0cbaf1f3b09b8e5821f8df..f52c696b3e86f6dcf58983794f4990a4ef5afa0b 100644 (file)
--- a/features/features-akka/src/main/feature/feature.xml
+++ b/features/features-akka/src/main/feature/feature.xml
@@ -25,6 +25,7 @@
         <bundle>mvn:org.scala-lang/scala-library/${scala.version}.${scala.micro.version}</bundle>
         <bundle>mvn:org.scala-lang/scala-reflect/${scala.version}.${scala.micro.version}</bundle>
         <bundle>mvn:org.scala-lang.modules/scala-java8-compat_${scala.version}/0.7.0</bundle>
+        <bundle>mvn:org.scala-lang.modules/scala-parser-combinators_${scala.version}/1.0.4</bundle>
     </feature>
     <feature name="odl-akka-system" description="Akka Actor Framework System Bundles" version="${akka.version}">
         <feature version="${scala.version}">odl-akka-scala</feature>
@@ -37,10 +38,17 @@
         <feature version="${akka.version}">odl-akka-system</feature>
         <bundle>wrap:mvn:org.uncommons.maths/uncommons-maths/1.2.2a</bundle>
         <bundle>mvn:com.google.protobuf/protobuf-java/2.5.0</bundle>
+        <bundle>mvn:com.typesafe/ssl-config-akka_${scala.version}/0.2.1</bundle>
+        <bundle>mvn:com.typesafe/ssl-config-core_${scala.version}/0.2.1</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-cluster_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-protobuf_${scala.version}/${akka.version}</bundle>
-        <bundle>mvn:io.netty/netty/3.10.6.Final</bundle>
         <bundle>mvn:com.typesafe.akka/akka-remote_${scala.version}/${akka.version}</bundle>
-        <bundle>mvn:com.typesafe.akka/akka-cluster_${scala.version}/${akka.version}</bundle>
+        <bundle>mvn:com.typesafe.akka/akka-stream_${scala.version}/${akka.version}</bundle>
+        <bundle>wrap:mvn:org.agrona/Agrona/0.5.4</bundle>
+        <bundle>wrap:mvn:io.aeron/aeron-client/1.0.1</bundle>
+        <bundle>wrap:mvn:io.aeron/aeron-driver/1.0.1</bundle>
+        <bundle>mvn:io.netty/netty/3.10.6.Final</bundle>
+        <bundle>mvn:org.reactivestreams/reactive-streams/1.0.0</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 be52ff46b3643dbe8a62f99f7a9af5a02626c634..1b6ef734c6c88a1036b214c2f92ef712b85d7164 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -116,7 +116,7 @@
     <!-- Used by controller, snbi; see also centinel, dlux, toolkit -->
     <osgi.core.version>5.0.0</osgi.core.version>
 
-    <akka.version>2.4.7</akka.version>
+    <akka.version>2.4.11</akka.version>
     <scala.version>2.11</scala.version>
     <scala.micro.version>8</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
@@ -997,7 +997,24 @@
         <version>1.3.0</version>
       </dependency>
 
+      <!-- Reactive Streams, used by Akka -->
+      <dependency>
+        <groupId>org.reactivestreams</groupId>
+        <artifactId>reactive-streams</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+
       <!-- Akka -->
+      <dependency>
+        <groupId>com.typesafe</groupId>
+        <artifactId>ssl-config-akka_${scala.version}</artifactId>
+        <version>0.2.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.typesafe</groupId>
+        <artifactId>ssl-config-core_${scala.version}</artifactId>
+        <version>0.2.1</version>
+      </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-actor_${scala.version}</artifactId>
@@ -1008,6 +1025,11 @@
         <artifactId>akka-cluster_${scala.version}</artifactId>
         <version>${akka.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.typesafe.akka</groupId>
+        <artifactId>akka-osgi_${scala.version}</artifactId>
+        <version>${akka.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
         <artifactId>akka-persistence_${scala.version}</artifactId>
@@ -1025,25 +1047,30 @@
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-testkit_${scala.version}</artifactId>
+        <artifactId>akka-slf4j_${scala.version}</artifactId>
         <version>${akka.version}</version>
-        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-osgi_${scala.version}</artifactId>
+        <artifactId>akka-stream_${scala.version}</artifactId>
         <version>${akka.version}</version>
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-slf4j_${scala.version}</artifactId>
+        <artifactId>akka-testkit_${scala.version}</artifactId>
         <version>${akka.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.scala-lang.modules</groupId>
         <artifactId>scala-java8-compat_${scala.version}</artifactId>
         <version>0.7.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.scala-lang.modules</groupId>
+        <artifactId>scala-parser-combinators_${scala.version}</artifactId>
+        <version>1.0.4</version>
+      </dependency>
       <dependency>
         <groupId>org.iq80.leveldb</groupId>
         <artifactId>leveldb</artifactId>
@@ -1065,6 +1092,23 @@
         <version>2.5.0</version>
       </dependency>
 
+      <!-- Aeron, required by Akka -->
+      <dependency>
+        <groupId>org.agrona</groupId>
+        <artifactId>Agrona</artifactId>
+        <version>0.5.4</version>
+      </dependency>
+      <dependency>
+        <groupId>io.aeron</groupId>
+        <artifactId>aeron-client</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>io.aeron</groupId>
+        <artifactId>aeron-driver</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+
       <!-- Scala -->
       <dependency>
         <groupId>org.scala-lang</groupId>