Bug 4964: Akka 2.4.1 version bump

The akka/scala version definitions are now in odlparent so removed the
local definitions.

Change-Id: I62cdf60aa1277e4cebebd614fd64b90661d2b8d3
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

diff --git a/netconf/abstract-topology/pom.xml b/netconf/abstract-topology/pom.xml
index 827e4de1b7317e0eaeb926b05605de6f7a612a98..b6d75095377ea1a52ce41cee1c017d744df6d844 100644 (file)
--- a/netconf/abstract-topology/pom.xml
+++ b/netconf/abstract-topology/pom.xml
@@ -29,10 +29,6 @@
     </dependencyManagement>
 
     <properties>
-        <!-- FIXME: should be inherited from odlparent -->
-        <akka.version>2.3.14</akka.version>
-        <scala.major.version>2.11</scala.major.version>
-        <scala.minor.version>7</scala.minor.version>
     </properties>
 
     <dependencies>
@@ -59,27 +55,22 @@
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>${scala.major.version}.${scala.minor.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.major.version}</artifactId>
-            <version>${akka.version}</version>
+            <artifactId>akka-actor_${scala.version}</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-remote_${scala.major.version}</artifactId>
-            <version>${akka.version}</version>
+            <artifactId>akka-remote_${scala.version}</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_${scala.major.version}</artifactId>
-            <version>${akka.version}</version>
+            <artifactId>akka-cluster_${scala.version}</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-osgi_${scala.major.version}</artifactId>
-            <version>${akka.version}</version>
+            <artifactId>akka-osgi_${scala.version}</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe</groupId>

diff --git a/netconf/netconf-topology/src/test/resources/test.conf b/netconf/netconf-topology/src/test/resources/test.conf
index 3346d64ad8ee19f6b75da0681ed0a07e7aaf9493..b8c72947b5f90f3fcf768473929014addb765001 100644 (file)
--- a/netconf/netconf-topology/src/test/resources/test.conf
+++ b/netconf/netconf-topology/src/test/resources/test.conf
@@ -1,7 +1,5 @@
 akka {
 
-  version = "2.3.14"
-
   actor {
     provider = "akka.cluster.ClusterActorRefProvider"
 
@@ -21,5 +19,4 @@ akka {
       hostname = "127.0.0.1"
     }
   }
-
 }