Bump Scala to 2.11.8 and akka to 2.4.3

Since we are still at the start of our development cycle, it should be relatively
safe to upgrade to these bugfix releases.

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

diff --git a/features-akka/pom.xml b/features-akka/pom.xml
index ff7deb0574918afc873f154c1cb481d2ed1ee5ef..8206da3772eaafa42de44826ae3bdf6a11e59402 100644 (file)
--- a/features-akka/pom.xml
+++ b/features-akka/pom.xml
@@ -25,6 +25,10 @@
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
       </dependency>
+      <dependency>
+        <groupId>org.scala-lang.modules</groupId>
+        <artifactId>scala-java8-compat_${scala.version}</artifactId>
+      </dependency>
       <dependency>
         <groupId>com.typesafe</groupId>
         <artifactId>config</artifactId>

diff --git a/features-akka/src/main/features/features.xml b/features-akka/src/main/features/features.xml
index 5cd3dbcae40f135fa2628a3e480edc9dd9b9b5c7..252397714bf4f15e31bda9e8e5b6bec77d3ca247 100644 (file)
--- a/features-akka/src/main/features/features.xml
+++ b/features-akka/src/main/features/features.xml
@@ -20,6 +20,7 @@
     <feature name="odl-akka-scala" description="Scala Runtime for OpenDaylight" version="${scala.version}">
         <bundle>mvn:org.scala-lang/scala-library/{{VERSION}}</bundle>
         <bundle>mvn:org.scala-lang/scala-reflect/{{VERSION}}</bundle>
+        <bundle>mvn:org.scala-lang.modules/scala-java8-compat_2.11/{{VERSION}}</bundle>
     </feature>
     <feature name="odl-akka-system" description="Akka Actor Framework System Bundles" version="${akka.version}">
         <feature version="${scala.version}">odl-akka-scala</feature>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 16154b31d2422a4a27e8bc223528ab223adbcdbc..d3756cee3d55c46e0d2854cb737cf2606929d57b 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -124,9 +124,9 @@
     <!-- Used by persistence, snmp4sdn; see also affinity, toolkit -->
     <slf4j.version>1.7.12</slf4j.version>
 
-    <akka.version>2.4.1</akka.version>
+    <akka.version>2.4.3</akka.version>
     <scala.version>2.11</scala.version>
-    <scala.micro.version>7</scala.micro.version>
+    <scala.micro.version>8</scala.micro.version>
     <leveldb.version>0.7</leveldb.version>
 
     <!-- Default Sonar configuration -->
@@ -947,6 +947,11 @@
         <artifactId>akka-slf4j_${scala.version}</artifactId>
         <version>${akka.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.scala-lang.modules</groupId>
+        <artifactId>scala-java8-compat_${scala.version}</artifactId>
+        <version>0.7.0</version>
+      </dependency>
       <dependency>
         <groupId>org.iq80.leveldb</groupId>
         <artifactId>leveldb</artifactId>