BUG-4963: Bump scala to 2.11.7

With 2.10 i was experiencing random freezes
when installing features that used it in karaf.
Bumping to 2.11 doesn't seem to break anything
nor has any downsides.

We have scala.micro.version defined so use it instead of the
hardcoded micro version

Change-Id: I2a445790980d0da3152db3664294fd789f8272c7
Signed-off-by: Tomas Cere <tcere@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/akka/pom.xml b/features/akka/pom.xml
index ece109cf19a70b8d5a7b5876e3dcddbeb6a8ef81..b6d45018b406a90ff82598347ec1bf374415cdf7 100644 (file)
--- a/features/akka/pom.xml
+++ b/features/akka/pom.xml
@@ -26,7 +26,7 @@
       <karaf.empty.version>1.7.0-SNAPSHOT</karaf.empty.version>
       <surefire.version>2.16</surefire.version>
       <akka.version>2.3.14</akka.version>
-      <scala.version>2.10</scala.version>
+      <scala.version>2.11</scala.version>
    </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index f7ab2d978d4051d0bfb80d0ce32cb6a059f7e8d6..12facdb4a368cf02a5c278cff13e0d0e257dea10 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -119,8 +119,8 @@
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
     <sanitytest.version>0.7.0-SNAPSHOT</sanitytest.version>
-    <scala.version>2.10</scala.version>
-    <scala.micro.version>4</scala.micro.version>
+    <scala.version>2.11</scala.version>
+    <scala.micro.version>7</scala.micro.version>
     <security.version>0.7.0-SNAPSHOT</security.version>
     <karaf.security.version>0.7.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
@@ -784,12 +784,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>